Re: [RFC/PATCH] commit: make the error message on unmerged entries user-friendly.

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 6, 2010, 20:05 UTC
Message-ID: <7vy6kbt2ww.fsf@alter.siamese.dyndns.org>
In-Reply-To: <vpqocl76mdo.fsf@bauges.imag.fr>

Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:

Show 6 quoted lines

> They'd use "pull", not merge. Anyway, I did it for commit, merge,
> pull, revert, cherry-pick. I guess we covered the common cases.
> The patch seems to have a lot of redundancies, but I think trying to
> factor this into helper functions would be much more effort than the
> few cut-and-paste that I had to do, since each instance is a slight
> variant of each other ...

I'd be more worried about longer term maintainability than one time expediency of producing your single patch to add these messages. If the messages are cast in stone, we can just verify they are consistent _now_ and forget about them, but I suspect not even you are perfect to predict that we won't come up with different/better ways to resolve and mark them resolved in the future and write a set of messages that won't have to change.