In <[email protected]>, 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. ,= ,-_-. =. [email protected] ((_/)o o(\_)) ICQ: 514984 YM/AIM: DaTwinkDaddy `-'(. .)`-' http://iguanasuicide.net/ \_/
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Kde-scm-interest mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-scm-interest
