On Wed, Jan 17, 2007 at 10:03:13AM +0100, Karl Hasselström wrote: > (BTW, I've never seriously tried git rebase; does anyone have an > opinion of how convenient its conflict handling is, compared to > stgit's?) When I was using it, it was much less convenient than stgit - required to forge a git-am command-line to continue after a conflict (--continue was added in April '06 - I had switched to StGIT before implementing it myself ;). My evaluation at that point was that it required too much understanding of the plumbing issues to be shown to a newbie - a problem which StGIT does not have. But I have not used it any more since then, and did not follow any improvements in this field. StGIT features like "push --undo" also make it much easier to delay merge of a given patch, and stack handling makes it easier to continue your work after a night-break. Not to mention all goodies like patch reordering. Best regards, -- Yann. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html