Andrew Wong wrote: > Besides the "empty commit" failure, "cherry-pick" can still run into > various errors, such as merge conflict. Cherry-pick does the merge, so it is what notices the merge conflict. If you search for CHERRY_PICK_HELP in builtin/revert.c, the relevant code should show up. -- 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