Sometimes there's only the nuclear option left, I have only done it a few times, someone merged a major refactoring and we ended up reverting by changing history.

I have also observed that when you revert with git revert and then merge back some time later git can get confused about if a commit was merged or not.

Mind you we didn't use git flow or other smart processes to our own regret.

[–] Double_A@discuss.tchncs.de 2 points 1 year ago* (last edited 1 year ago) (1 children)

git can get confused about if a commit was merged or not.

You have to revert the revert before re-merging the branch. Otherwise git keeps track of the commits that you reverted and doesn't apply them ever again.

See: https://github.com/git/git/blob/master/Documentation/howto/revert-a-faulty-merge.txt

[–] BeigeAgenda@lemmy.ca 2 points 1 year ago

Thanks for the info, I think that's exactly what we didn't do.