自分の作業がない状態で、新しいbranchをpullしたらCONFLICTした
g co master
g reset HEAD --hard
g br -D branchname
g fetch
or
g pull --rebase
Created
February 25, 2013 02:55
-
-
Save taea/5027129 to your computer and use it in GitHub Desktop.
新しいbranchをpullしたらCONFLICTした
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment