Re:I Kind of Like Rebasing
by spankalee on Saturday June 22, 2024 @08:52PM
(#40763672)
I try not to rebase and force push for branches under active review though. It makes it much harder for the reviewer to see the changes that have happened since they last reviewed.
[ Parent
| on HN ]
That's only a problem when using GitHub. GitLab and Gerrit correctly version such force push PR updates and provide a nice view of what has changed.
Re:I Kind of Like Rebasing
by everybodyknows on Sunday June 23, 2024 @10:02AM
(#40767530)
I version-number PR branches for upstreams on GitHub. If my branch 'for-upstream-13.0' does not apply cleanly on top of upstream 'main', I sync my fork's 'main' to upstream in GitHub's Web GUI, fetch to my desktop, and build a new 'for-upstream-13.1' on top, with the help of git-cherry-pick. Might need a new PR. All history is preserved, both on GH and locally.