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. (ug

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.