Re-doing a reverted merge in Git

by

You have to “revert the revert”. Depending on you how did the original revert, it may not be as easy as it sounds. Look at the official document on this topic.

---o---o---o---M---x---x---W---x---Y
              /
      ---A---B-------------------C---D

to allow:

---o---o---o---M---x---x-------x-------*
              /                       /
      ---A---B-------------------C---D

But does it all work? Sure it does. You can revert a merge, and from a
purely technical angle, git did it very naturally and had no real
troubles.
It just considered it a change from “state before merge” to
“state after merge”, and that was it.
Nothing complicated, nothing odd,
nothing really dangerous. Git will do it without even thinking about it.

So from a technical angle, there’s nothing wrong with reverting a merge,
but from a workflow angle it’s something that you generally should try to
avoid.

If at all possible, for example, if you find a problem that got merged
into the main tree, rather than revert the merge, try really hard to:

  • bisect the problem down into the branch you merged, and just fix it,
  • or try to revert the individual commit that caused it.

Yes, it’s more complex, and no, it’s not always going to work (sometimes
the answer is: “oops, I really shouldn’t have merged it, because it wasn’t
ready yet, and I really need to undo all of the merge”). So then you
really should revert the merge, but when you want to re-do the merge, you
now need to do it by reverting the revert.

More Related Contents:

  1. Undo a Git merge that hasn’t been pushed yet
  2. When do you use Git rebase instead of Git merge?
  3. How can I move HEAD back to a previous location? (Detached head) & Undo commits
  4. How to cherry-pick a range of commits and merge them into another branch?
  5. Have Git Select Local Version On Merge Conflict on a Specific File?
  6. How can I selectively merge or pick changes from another branch in Git?
  7. Git workflow and rebase vs merge questions
  8. Why does git perform fast-forward merges by default?
  9. Resolve Git merge conflicts in favor of their changes during a pull
  10. Rollback to an old Git commit in a public repo
  11. How can I merge two commits into one if I already started rebase?
  12. Undo a particular commit in Git that’s been pushed to remote repos
  13. How to resolve git error: “Updates were rejected because the tip of your current branch is behind”
  14. What’s the difference between Git Revert, Checkout and Reset?
  15. How do I ‘overwrite’, rather than ‘merge’, a branch on another branch in Git?
  16. git remove merge commit from history
  17. tell git to use ours merge strategy on specific files
  18. git merge, keep both
  19. How can I preview a merge in git?
  20. How can I revert uncommitted changes including files and folders?
  21. How can I configure KDiff3 as a merge tool and diff tool for git?
  22. Is it possible to pull just one file in Git?
  23. Sharing rerere cache
  24. Restart/undo conflict resolution in a single file
  25. Is there a git-merge –dry-run option?
  26. Git merge doesn’t use default merge message, opens editor with default message
  27. Merging two remote repositories in Git
  28. Restore git files deleted after git merge –abort
  29. The following untracked working tree files would be overwritten by merge, but I don’t care
  30. How do you detect an evil merge in git?

Leave a Comment