Re: [RFC] improving advice message from git commit during a merge

On 27.08.2014 20:23, Junio C Hamano wrote: I am not doing this myself soon, though. Hint, hint... I asked once upon a time, if there was a place, which collects such topics for casual contributors and new comers. Would you mind to update the leftover bits at

Re: [RFC] improving advice message from git commit during a merge

Stefan Beller stefanbel...@gmail.com writes: On 27.08.2014 20:23, Junio C Hamano wrote: I am not doing this myself soon, though. Hint, hint... I asked once upon a time, if there was a place, which collects such topics for casual contributors and new comers. Would you mind to update the

[RFC] improving advice message from git commit during a merge

When there are unmerged paths, you would often get something like this: [git.git (pu|MERGING]$ git commit U copy.c U wrapper.c error: commit is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm file'

Re: [RFC] improving advice message from git commit during a merge

On Wed, Aug 27, 2014 at 11:23:08AM -0700, Junio C Hamano wrote: When there are unmerged paths, you would often get something like this: [git.git (pu|MERGING]$ git commit U copy.c U wrapper.c error: commit is not possible because you have unmerged files.

Re: [RFC] improving advice message from git commit during a merge

Jeff King p...@peff.net writes: - When all the unmerged paths have their conflicts resolved in the working tree, we do not have to say Fix them up in the work tree,. We can instead say You seem to have fixed them up in the work tree already, or something. How are you determining