Re:Julia Evans: Git rebase, what can go wrong
by thebigspacefuck on Monday November 06, 2023 @07:14PM
(#38171233)
It’s annoying when someone force pushes to a branch that you just reviewed, but you can no longer see the history so you have to scan through the whole PR you already reviewed looking for the change. Please just commit the fix, let me see it, then squash it.
[ Parent
| on HN ]
Re:Julia Evans: Git rebase, what can go wrong
by sam_bristow on Monday November 06, 2023 @09:36PM
(#38172495)
Unfortunately I haven't seen a git forge that will let you do "autosquash on merge" so I could just push up fixup commits as part of an merge request.
Re:Julia Evans: Git rebase, what can go wrong
by PhilippGille on Wednesday November 08, 2023 @04:59PM
(#38197712)
Re:Julia Evans: Git rebase, what can go wrong
by seba_dos1 on Thursday November 09, 2023 @12:49AM
(#38201626)
That always squashes the whole PR into a single commit, making it not very useful in practice. Git's autosquashing is much more powerful than that.
Re:Julia Evans: Git rebase, what can go wrong
by seba_dos1 on Thursday November 09, 2023 @12:51AM
(#38201639)
You can just diff the previous head with the new one. In GitLab, it's simply a matter of clicking "Compare with previous version". Locally, it's `git diff branch@{1}..branch`.
It's only becoming tricky if the MR has been rebased onto a different base in the process, but it's not very hard to deal with that too if needed (just annoying).