2 ms·
Daily local rebase on master is really the only acceptable use I know for rebasing. It's not just after a month of vacation, but simply when your local branch h
by mcv 7y ago
Daily local rebase on master is really the only acceptable use I know for rebasing. It's not just after a month of vacation, but simply when your local branch has a lot of commits, that rebasing can become very painful, as you may have to resolve the same conflict over and over and over again. That must be the circle of hell where programmers end up.
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.
- AstralStorm 7y agoGit-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.