Fixing rebase rather than avoiding it

[Matthew D. Fuller]

On Thu, Mar 04, 2010 at 02:14:32PM +0100 I heard the voice of
Óscar Fuentes, and lo! it spake thus:
> 
> My point here is that there scenarios where rebase makes sense. I'm
> not proposing to rebase when a merge is the right thing.

Well, nobody ever does.  They just disagree on whether a merge is the
right thing occasionally, sometimes, often, or essentially always   :)


-- 
Matthew Fuller     (MF4839)   |  fullermd at over-yonder.net
Systems/Network Administrator |  http://www.over-yonder.net/~fullermd/
           On the Internet, nobody can hear you scream.