Restart/undo conflict resolution in a single file

by

Found the solution here: http://gitster.livejournal.com/43665.html

git checkout -m FILE

This restores the unresolved state, including all information about parent and merge base, which allows restarting the resolution.

More Related Contents:

  1. I ran into a merge conflict. How can I abort the merge?
  2. What is the best (and safest) way to merge a Git branch into master?
  3. How can I selectively merge or pick changes from another branch in Git?
  4. Is there a “theirs” version of “git merge -s ours”?
  5. How can I merge multiple commits onto another branch as a single squashed commit?
  6. Merge, update, and pull Git branches without using checkouts
  7. Re-doing a reverted merge in Git
  8. Is there a git-merge –dry-run option?
  9. When would you use the different git merge strategies?
  10. What’s the difference between ‘git merge’ and ‘git rebase’?
  11. .gitignore and “The following untracked working tree files would be overwritten by checkout”
  12. How do I safely merge a Git branch into master?
  13. I ran into a merge conflict. How do I abort the merge?
  14. What’s the simplest way to list conflicted files in Git?
  15. Git merge hotfix branch into feature branch
  16. Get changes from master into branch in Git
  17. Which version of the git file will be finally used: LOCAL, BASE or REMOTE?
  18. Git merge error “commit is not possible because you have unmerged files”
  19. Find unmerged Git branches?
  20. how can I customize git’s merge commit message?
  21. error: Your local changes to the following files would be overwritten by checkout
  22. How do I fix a merge conflict due to removal of a file in a branch?
  23. Tell git not to merge binary files but to choose
  24. How to keep a branch synchronized/updated with master?
  25. How to merge specific files from Git branches
  26. git: merge two branches: what direction?
  27. Telling if a Git commit is a Merge/Revert commit
  28. Git merge branch into master
  29. How to quit (not abort) a Git merge in progress keeping the changes uncommitted?
  30. The following untracked working tree files would be overwritten by merge, but I don’t care

Leave a Comment