Re: [PATCH] Reference technical/trivial-merge.txt in git-read-tree documentation

From: Junio C Hamano <junkio@cox.net>
Date: Nov 27, 2005, 21:16 UTC
Message-ID: <7v1x11dc6g.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20051127124108.GB22159@pasky.or.cz>

Petr Baudis <pasky@suse.cz> writes:

Show 11 quoted lines

> Dear diary, on Fri, Nov 11, 2005 at 09:51:40PM CET, I got a letter
> where Petr Baudis <pasky@suse.cz> said that...
>> That file, with the so valuable (and so confusing) tables describing
>> the precise resolution rules git-read-tree follows, silently sat in
>> the corner and almost noone knew about it (well, I didn't, at least).
>> This references it from the git-read-tree documentation, so that there
>> is some chance that interested people will find it.
>> 
>> Signed-off-by: Petr Baudis <pasky@suse.cz>
>
> Any gripes, or just forgotten?

What happened was that I thought I'd apply after rewording the sarcasm and maybe moving the existing table to the one in technical/ (or just removing the old table), and forgot about it.

One thing I do not like the table in technical/ is that it is harder to read as the "case table" than the original. Admittedly, it is meant to describe more complex situation, so it _is_ harder to understand, but a major difference is that the original table was designed to decribe things orthogonally and you did not have to read from top to bottom (any situation would have fallen in one case no matter what order you checked the condition for each case), while the updated table in technical/ _must_ be read from top to bottom and take the first match, and that was what made me feel reluctant to remove the existing one from the original document.