3 ms·
> The sad part is that IMO merge people are on that side because they are afraid of rebase or don't understand it. Not necessarily. I understand rebase, but it
by elsurudo 10y ago
> The sad part is that IMO merge people are on that side because they are afraid of rebase or don't understand it.
Not necessarily. I understand rebase, but it is often a much more complex operation than a marge, and for (often) little gain (cleaner log). So it's a tradeoff. When the team is small enough that log pollution isn't too much of an issue, it's not worth rebasing, IMO.
- hashkb 10y agoWith all respect, I disagree. For me rebase has identical difficulty but more flexibility. You could call that "much more complex" and I can call it "just as easy but way more powerful" and we'd both be right, I suppose. I use the rebase flow on my solo projects as well as advocate for it on large teams. Even (especially) when it's just me, having a tidy history saves me tons of time; especially when I'm prone to constant distraction by business-y things. Edit: s/I/I'm/