Re:Why large companies and fast-moving startups are banning ...
by kevingadd on Friday December 29, 2023 @04:11PM
(#38810231)
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.)
(Merging has the same problem, so I squash frequently and then rebase.)