Reset update branch before merging the base branch

[fthomas]

Closes #2503.

[codecov]

Codecov Report

Merging #2504 (fb5b72f) into main (0620824) will increase coverage by 0.00%.
The diff coverage is 76.92%.

@@           Coverage Diff           @@
##             main    #2504   +/-   ##
=======================================
  Coverage   81.16%   81.16%           
=======================================
  Files         142      142           
  Lines        2500     2511   +11     
  Branches       55       50    -5     
=======================================
+ Hits         2029     2038    +9     
- Misses        471      473    +2     

Impacted Files	Coverage Δ
...ala/org/scalasteward/core/nurture/NurtureAlg.scala	0.00% <0.00%> (ø)
...n/scala/org/scalasteward/core/git/FileGitAlg.scala	98.52% <100.00%> (+0.19%)	⬆️
...in/scala/org/scalasteward/core/git/GenGitAlg.scala	93.10% <100.00%> (+0.24%)	⬆️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0620824...fb5b72f. Read the comment docs.

[fthomas]

This change can be seen in action in scala-steward-org/test-repo-2#87 and scala-steward-org/test-repo-2#127.

[nafg]

This seems to result in PRs accruing lots of revert commits.

Instead why not recreate the branch from scratch? Why not git rest to the base branch and force push?

[nafg]

slick/slick#2511 got to nineteen commits by the time Mergify merged it!!!

[nafg]

This is really bad, any chance of reverting it?

[fthomas]

This is really bad

I find your tone rude. Please be more constructive in future interactions in this project.

[nafg]

Apologies, I did not mean it in that way.

Where do we go from here? slick/slick#2491 now has 43 commits.

[exoego]

Please open a new issue to collect feedback from community.
PR is also welcome.