4 ms·
The fact that people have a harder time understanding rebase is evidence that rebase is harder to reason about. Whether you update your understanding based on
by recursive 9mo ago
The fact that people have a harder time understanding rebase is evidence that rebase is harder to reason about. Whether you update your understanding based on that evidence is up to you. If I have to pick between merge and rebase, I would generally pick merge. It seems to cause less conflicts with long-lived branches. Commits maintain their identity so each one has to be conflict-resolved at most once.
However, even better for me (and my team) is squash on PR resolve.
- jghn 9mo agoIMO it's one of those things where rebase is at first less intuitive but once you get it is a lot simpler & easier to reason about. In contrast merging at first seems more straightforward but is actually less so. that's not a value judgement in either direction, both initially simpler and longterm simpler have their merits.