• BeigeAgenda@lemmy.ca
    link
    fedilink
    arrow-up
    2
    ·
    1 year ago

    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.