From: Ralf Thielow Date: Fri, 25 May 2012 18:35:30 GMT Subject: Re: fmt-merge-message: add empty line between tag and signature verification Message-ID: In-Reply-To: <7vtxz4tcmn.fsf@alter.siamese.dyndns.org> On Fri, May 25, 2012 at 7:05 PM, Junio C Hamano wrote: >> Btw, I'd also like to see the merge notes (notably the conflict file list) >> before the generated shortlog, but that seems to really not work with the >> current fmt-merge-message model.  Oh well. > > Postponing to assess if such a change is feasible, I am not sure if that > ordering makes more sense than the current one.  Is the objective to more > strongly motivate people to explain what happened to the conflicts? IMHO it only makes sense when you have a short list of conflicted files. I mostly work on Java projects and when we merge a branch this list can be very long. This is caused by several tools, different IDEs, different OSes and so on and so forth. Anyway... What I want to see on a merge like this is the shortlog. I only become interested in the conflicts if there is an issue in the software caused by a conflict resolution. Just my experience on Java projects I'm working on.