4 ms·
Rebasing isn't that hard, but you also spent 8 paragraphs explaining it. Explaining merging just takes one paragraph: Copy all the changes from the main branch
by jkubicek 3y ago
Rebasing isn't that hard, but you also spent 8 paragraphs explaining it. Explaining merging just takes one paragraph: Copy all the changes from the main branch into my branch, if someone changed the same line that I changed, then create a merge conflict and manually figure out which change is right.
- dale_glass 3y agoIt's a matter of taste really, there are pros and cons to both. Rebase also can produce merge conflicts when doing the rebase. Sometimes that makes resolving them easier and sometimes harder.
- AlotOfReading 3y agoTheir explanation is one sentence. The rest is context, examples, and useful extensions of the basic idea (e.g. interactive rebases).