Re:Extremely Linear Git History
by jamespwilliams on Tuesday November 22, 2022 @06:29PM
(#33713035)
If you squash you decrease the granularity of your git history, though.
Re:Extremely Linear Git History
by TheRealPomax on Tuesday November 22, 2022 @07:18PM
(#33713406)
If you have ten different commits all touching the same part(s) of the same file(s), dial down your granularity a little: you've over-committed.
Either that, or you lobbed 10 different issues into the same branch, which is a whole different barrel of "no one benefits from this, you're just making it harder to generate a changelog, can you please not" fish.
Rebase is being annoying here mostly because it's doing exactly what you want it to do: warn you about merge conflicts for every commit in the chain that might have any.