4 ms·
Historically any time I try to rebase a branch with more than a few commits in it, it effectively fails unless I squash it because resolving all the conflicts f
by kevingadd 3y ago
Historically any time I try to rebase a branch with more than a few commits in it, it effectively fails unless I squash it because resolving all the conflicts for every commit would take me over an hour. Maybe this is just a 'many contributors' problem though, since our repo lands many large PRs each day.
(Merging has the same problem, so I squash frequently and then rebase.)
- feanaro 3y agoHow does merging have the same problem? By definition, merging only requires you to resolve the conflicts once, at the point of the merge commit.