Hi,
Patrick Doyle wrote:
> Needless to say, I was able to calm them down. But it occurred to me
> that "needs update" isn't necessarily the most helpful message and
> that "error: ... Cannot merge" could offer a little more explanation.
>
> I'm happy to submit the trivial patch changing "needs update" to
> "locally modified". I suspect there might be some ramifications in
> terms of scripts that expect the old message to be there
[...]
> What do folks think?
I think you are quite right, on both counts.
See v1.6.0-rc0~4 ("needs update" considered harmful, 2008-07-20) and
v1.5.6-rc0~7^2 (unpack-trees: allow Porcelain to give different error
messages, 2008-05-17) for inspiration. Do you remember which
porcelain command was making trouble in this example?
--
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