Re: Commit hook annoyance

[Doug Evans <xdje42@gmail.com>]

On Fri, Jan 16, 2015 at 8:41 AM, Eli Zaretskii <eliz@gnu.org> wrote:
>> Date: Fri, 16 Jan 2015 20:18:41 +0400
>> From: Joel Brobecker <brobecker@adacore.com>
>> Cc: gdb-patches@sourceware.org
>>
>> There is a commit whose revision log has a line that has "Conflict:"
>> in its revision log. This usually happens when you cherry-pick
>> a commit, resolve merge conflicts, and then commit again. Git
>> decides to append a section at the end off the new revision log
>> which lists the files where there were some conflicts.
>
> Yes, that's what happened.  Quite normal.
>
>> In our experience at AdaCore, these are useless, and people often
>> don't even notice them. Hence the check.
>
> Being useless doesn't mean harmful.  (I do notice that part, but I'm
> used to leaving it there.)  Rejecting a push is an annoyance I'd
> rather do without.  Moreover, that line is a record of the fact that
> there was a conflict, which might be useful one day.
>
> So how about removing that particular reason for rejecting a push?

I dunno, let's not rush into a change.

Having caught up on the thread, at the moment I'm kinda liking the check.