On Tue, Feb 15, 2011 at 22:23, Jay Soffian <jaysoffian@xxxxxxxxx> wrote: > The user-experience after a cherry-pick conflicts is suboptimal. > The user has two choices for committing the resolved state: I've read this over, haven't run it, but I really like the idea. It sucks that you have to save away the commit sha1 somwhere after a failed cherry-pick to use it again. It should just behave like `git rebase --continue`, which this implements. It'll need some tests as a non-RFC, but otherwise it looks good. -- 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