[Kde-scm-interest] Re: Usage of pull rebasing and merges

[Boyd Stephen Smith Jr.]

In <201102091131.p19BVic4023185 at mgw-da01.nokia.com>, Thiago Macieira wrote:
>> If I author a branch, then contributor X puts two commits on it to fix
>> compilation errors on m68k, contributor Y puts a commit on it adding the
>> doxygen documentation I forgot, and contributor Z provides a new test case
>> for my code that is broken with a separate commit to fix it, I should
>> rebase, yes? Some of those commits aren't mine!
>
>No. But there's no reason why there needs to be merge commits in-between.

I fundamentally disagree here then.  I say that you *do* rebase.  Not 
specifically rebase, but you do need to rewrite some commits.  At least 3 (and 
possibly all) of those additional commits need to be squashed into my changes.  
In fact, the existence of each of those commits shows one way at least one of 
my old commits are "bad".  I would probably use git rebase --interactive to do 
the rewriting.
-- 
Boyd Stephen Smith Jr.                   ,= ,-_-. =.
bss at iguanasuicide.net                   ((_/)o o(\_))
ICQ: 514984 YM/AIM: DaTwinkDaddy         `-'(. .)`-'
http://iguanasuicide.net/                    \_/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
Url : http://mail.kde.org/pipermail/kde-scm-interest/attachments/20110209/7fca654b/attachment.sig