Heya, On Thu, Jul 29, 2010 at 18:51, Jonathan Nieder <jrnieder@xxxxxxxxx> wrote: > though, I find the best solution is to use short, formulaic messages: > > ... > Recorded resolution for 'dir/a'. > [detached HEAD aa9ae6b] related change > 1 files changed, 1 insertions(+), 1 deletions(-) > fatal: could not apply 649420f... second > hint: after resolving the conflicts, mark the corrected paths > hint: with 'git add <paths>' and run 'git rebase --continue' Yes please. This would be _extremely_ helpful! -- Cheers, Sverre Rabbelier -- 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