Re:Extremely Linear Git History
by alvarlagerlof on Tuesday November 22, 2022 @07:22PM
(#33713441)
Second part explains exactly what I'm juggling with right now.
Git recently added a --update-refs option to rebase that makes dealing with this scenario a lot easier.
This post does a good job explaining how to use it: https://andrewlock.net/working-with-stacked-branches-in-git-...
oh my... I was at the point of making a git plugin to do this. This pretty much was the bane of my existence.
:pray:
With this, you can also push people towards smaller PRs which are easier to review and integrate.
The downside is that if you és o work on feature 2 based on feature 1,either you wait for the PR to be merged in main (easiest approach) or you fork from your feature branch directly and will need to rebase later (this can get messier, especially if you need to fix errors in feature 1).