3 ms·
Nice idea. I’m more of a merge fan than rebase except for some cases (cases where there are more than a few conflicts and you want to deal with them on a commit
by quickthrower2 5y ago
Nice idea. I’m more of a merge fan than rebase except for some cases (cases where there are more than a few conflicts and you want to deal with them on a commit by commit basis)
- timhh 5y agoThanks! I haven't really tried that way of working - mainly because it feels less clean (more complicated history), especially if you want to keep your feature split into a nice sequence of small diffs to make review easier (I think some people call that a "stack of patches"). I guess there's no reason why you couldn't have an equivalent that automatically merges `master` into all of your branches though!