Skip to content

Instantly share code, notes, and snippets.

@tokikanno
Created January 23, 2017 09:21
Show Gist options
  • Select an option

  • Save tokikanno/9a7fc0815d3e2090be41f76ebc1b2106 to your computer and use it in GitHub Desktop.

Select an option

Save tokikanno/9a7fc0815d3e2090be41f76ebc1b2106 to your computer and use it in GitHub Desktop.

cancel conflict merge

git merge --abort
git reset --merge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment