Undoing accidental git merge without regressing history?

Use git revert on each of the branches. This will create a new commit that preserves your mistake for all eternity, but gives you back the same tree as you had before you merged.

Use git revert on each of the branches. This will create a new commit that preserves your mistake for all eternity, but gives you back the same tree as you had before you merged. For example, if 123456 is the merge commit... $ git checkout master $ git revert 123456 $ git checkout topic-branch $ git revert 123456 This assumes that this wasn't a "fast-forward" merge.

Thanks @dietrich. For my own reference when I google this next time, it's safest, and most intuitive to get back to a stable commit, one commit at a time and using the flag --no-commit to prevent one-at-a-time commits while backing out. Also, use -m 1 for merge commits.

– Bryce May 16 '11 at 19:56.

I cant really gove you an answer,but what I can give you is a way to a solution, that is you have to find the anglde that you relate to or peaks your interest. A good paper is one that people get drawn into because it reaches them ln some way.As for me WW11 to me, I think of the holocaust and the effect it had on the survivors, their families and those who stood by and did nothing until it was too late.