Re:Please stop recommending Gitflow
by AstralStorm on Thursday March 05, 2020 @01:11PM
(#22496260)
Git-rerere and smart merge tool like p4merge help a lot with this rebasing problem.
These are essential if you work with forced rebase mode like in Gerrit. (ugh)
You still have to be moderately careful and read the code again.
Basically you'd have to rebase after every single commit. That would keep it the most painless, I guess. But I can also just do a single merge and I'm done.