• jcg@halubilo.social
    link
    fedilink
    arrow-up
    3
    ·
    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?

    • Hexarei@programming.dev
      link
      fedilink
      arrow-up
      4
      ·
      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

    • Gecko@lemmy.world
      link
      fedilink
      English
      arrow-up
      1
      ·
      1 year ago

      You could just rebase your develop branch to a commit before the merge and have a different commit history, or actually do it properly and have squash merges.

      • Double_A@discuss.tchncs.de
        link
        fedilink
        English
        arrow-up
        1
        ·
        1 year ago

        do it properly and have squash merges

        If you have big features that deletes a lot of maybe important commit history.