Re:Julia Evans: Git rebase, what can go wrong
by spankalee on Monday November 06, 2023 @12:12PM
(#38165354)
A PR with merges is fine by me, it lets me see how the PR has evolved.
What I want is for GitHub to track changes between sets of commits in a PR so that you can do most of the review with merges and "address review comments" commits, and then rebase into well organized, logical commits and review that those have the same diff as the messy history after a force push.
Re:Julia Evans: Git rebase, what can go wrong
by adhesive_wombat on Monday November 06, 2023 @12:33PM
(#38165724)
At least Gitlab does that when you push a new commit (force or not) to the branch: it'll show a list of value of the branch head commit and you can diff between them.
Re:Julia Evans: Git rebase, what can go wrong
by smw on Monday November 06, 2023 @01:34PM
(#38166704)
So does Github, but it breaks if you fix via rebase and push -f. Gerrit and some other competitors manage this better.
Re:Julia Evans: Git rebase, what can go wrong
by richbell on Monday November 06, 2023 @01:03PM
(#38166163)
The problem is PRs that have <5 lines of changes followed by dozens of pointless merges, because users are prompted to merge every time another PR is merged.
It wouldn't be a problem if people took the time to organize the history prior to merging as you said, but most people don't do this.
Re:Julia Evans: Git rebase, what can go wrong
by pjc50 on Monday November 06, 2023 @03:42PM
(#38168683)
Some people have pull set to merge, which is a "I don't know how you can live like that" feature.
Re:Julia Evans: Git rebase, what can go wrong
by Nullabillity on Monday November 06, 2023 @04:34PM
(#38169341)
Some of us like our history tracking tools to.. track history.
GitHub recently added a feature that prompts people to update their branches via merge. It's frustrating because every PR now had dozens of merge commits polluting the history.