multi-gitter icon indicating copy to clipboard operation
multi-gitter copied to clipboard

conflict-strategy: replace should only force push on actual changes

Open tmeijn opened this issue 2 years ago • 1 comments

Describe the bug conflict-strategy: replace currently force pushes a commit to the existing branch even if there are no actual changes to process. This causes CI to run unnecessarily

To Reproduce Steps to reproduce the behavior:

  1. multi-gitter with conflict-strategy: replace
  2. make change to repository
  3. run multi-gitter
  4. run multi-gitter again

Expected behavior Multi-Gitter should ideally check if there is an actual delta between the existing branch and the current changes and only force push (replace) then there are changes.

tmeijn avatar Mar 17 '22 07:03 tmeijn

Thanks for the suggestion! I think this is something that should be fixed. In very rare scenarios I can see the current behavior being favored by the user. If the timestamp of the commit is important for example. But I think that can be discounted until someone states that it is need.

I would gladly merge a PR of this, but I will not currently prioritize this myself.

lindell avatar Mar 30 '22 18:03 lindell