Reverting a git merge while allowing for the same merge later)

by

Sorry to say that you have wasted your branch.

But there is a workaround. The trick is to “rewrite” the merge commit temporarily so that it forgets that the branch is a parent. Assume X is the merge commit:

git replace --graft X X^   # pretend that there is just one parent
git merge branch           # merge the branch again
git replace --delete X     # remove the replacement

More Related Contents:

  1. Evil merges in git?
  2. When would you use the different git merge strategies?
  3. What’s the difference between ‘git merge’ and ‘git rebase’?
  4. Git – how to force merge conflict and manual merge on selected file
  5. What’s the best visual merge tool for Git? [closed]
  6. Git: ignore some files during a merge (keep some files restricted to one branch)
  7. Moving Git repository content to another repository preserving history
  8. Git merge reports “Already up-to-date” though there is a difference
  9. Rebasing a Git merge commit
  10. Can I make fast forwarding be off by default in git?
  11. Prevent commits in master branch
  12. How do I merge changes to a single file, rather than merging commits?
  13. How does ‘git merge’ work in details?
  14. Merge changes from remote github repository to your local repository
  15. git merge: Removing files I want to keep!
  16. How do I use `git rebase -i` after `git merge` without messing things up?
  17. Making Git retain different section content between branches
  18. Git: Merge to master while automatically choosing to overwrite master files with branch
  19. How to identify conflicting commits by hash during git rebase?
  20. What Git branching models work for you?
  21. How to “git show” the diffs for a merge commit?
  22. Git – how to force manual merge even if there is no conflict
  23. How to rebase one Git repository onto another one?
  24. Tell git not to merge binary files but to choose
  25. git: merge two branches: what direction?
  26. How do I make git merge’s default be –no-ff –no-commit?
  27. How to perform a three-way diff in Git without merging?
  28. git subtree: possible to change subtree branch/path in a forked repository?
  29. Whats the Proper usage of .gitattributes with merge=ours
  30. How do you see / show a git merge conflict resolution that was done, given a merge commit SHA1?

Leave a Comment