• F04118F@feddit.nl
    link
    fedilink
    arrow-up
    6
    ·
    1 year ago

    You can always revert (i.e. undo in a new commit) the faulty commit. That will keep the history. This meme is not just about pushing straight to master, it’s about push --force which overwrites the remote branch completely, changing history.

    • BeigeAgenda@lemmy.ca
      link
      fedilink
      arrow-up
      4
      arrow-down
      1
      ·
      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.