News for hackers. Stuff that matters.
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.

There are no comments on this comment yet.