I ran into a merge conflict. How can I abort the merge?

by

Since your pull was unsuccessful then HEAD (not HEAD^) is the last “valid” commit on your branch:

git reset --hard HEAD

The other piece you want is to let their changes over-ride your changes.

Older versions of git allowed you to use the “theirs” merge strategy:

git pull --strategy=theirs remote_branch

But this has since been removed, as explained in this message by Junio Hamano (the Git maintainer). As noted in the link, instead you would do this:

git fetch origin
git reset --hard origin

More Related Contents:

  1. I ran into a merge conflict. How do I abort the merge?
  2. How do I resolve merge conflicts in a Git repository?
  3. When do you use Git rebase instead of Git merge?
  4. Git workflow and rebase vs merge questions
  5. Git merge left HEAD marks in my files
  6. Undo git pull, how to bring repos to old state
  7. Resolve Git merge conflicts in favor of their changes during a pull
  8. What’s the simplest way to list conflicted files in Git?
  9. Get changes from master into branch in Git
  10. Sharing rerere cache
  11. Git for beginners: The definitive practical guide
  12. Multiple GitHub accounts on the same computer?
  13. How can I delete all Git branches which have been merged?
  14. When would you use the different git merge strategies?
  15. Git: “Corrupt loose object”
  16. Rebasing a branch including all its children
  17. What’s the best visual merge tool for Git? [closed]
  18. Preferred Github workflow for updating a pull request after code review
  19. git gc –aggressive vs git repack
  20. How to perform better document version control on Excel files and SQL schema files
  21. Git merge hotfix branch into feature branch
  22. Locking binary files using git version control system
  23. Git mergetool generates unwanted .orig files
  24. git commit frequency
  25. How do I check out a specific version of a submodule using ‘git submodule’?
  26. How to keep a branch synchronized/updated with master?
  27. How do I remove a single file from the staging area (undo git add)?
  28. How to convert a Git repo to a submodule, which is nested in another (parent) Git repo?
  29. Restore git files deleted after git merge –abort
  30. Limiting file size in git repository

Leave a Comment