Comment on Openheimer in programming

lobut@lemmy.ca ⁨1⁩ ⁨year⁩ ago

• BeigeAgenda@lemmy.ca ⁨1⁩ ⁨year⁩ ago

  Sometimes there’s no other option when someone merged develop into master just before a critical bug was found.

  source

  • F04118F@feddit.nl ⁨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.

    source

    • BeigeAgenda@lemmy.ca ⁨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.

      source
    • jcg@halubilo.social ⁨1⁩ ⁨year⁩ ago

      What happens when you want to merge again? Won’t it say already up to date or something cause the commits are already there?

      source

      • Hexarei@programming.dev ⁨1⁩ ⁨year⁩ ago

        Revert doesn’t just move head back, it creates reversal commits. As such, merging again can happen since the changes are present and require a merge commit

        source