• @jcgA
    link
    311 months 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?

    • @[email protected]
      link
      fedilink
      511 months 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

    • @[email protected]
      link
      fedilink
      English
      111 months 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.

      • @[email protected]
        link
        fedilink
        English
        111 months ago

        do it properly and have squash merges

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