Johannes Sixt <j6t@xxxxxxxx> writes: > When a merge that has a conflict was rebased, then rebase stopped to let > the user resolve the conflicts. However, thereafter --continue failed > because the author-script was not saved. (This is rebase -i's way to > preserve a commit's authorship.) This fixes it by doing taking the same > failure route after a merge that is also taken after a normal cherry-pick. > > Signed-off-by: Johannes Sixt <j6t@xxxxxxxx> > --- > This is an attempt at fixing the failure. I don't know whether it is > problematic to leave a "patch" behind if there was actually a merge. > Nevertheless, all rebase tests pass. Interesting approach. Dscho? -- 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
