On Wed, Aug 11, 2010 at 6:31 PM, Jonathan Nieder <jrnieder@xxxxxxxxx> wrote: > Sverre Rabbelier wrote: >> 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! > > Ok. :) > > This does not suppress the “Could not apply” message at the end yet. Even better, make it available for some time with, say "git hints". After doing lots of things to resolve conflicts, I simply forget what it hinted me. -- Duy -- 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