Re: [PATCH] xmerge.c: fix xdl_merge to conform with the manual

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 4, 2015, 20:01 UTC
Message-ID: <xmqqfv9k8rcs.fsf@gitster.dls.corp.google.com>
In-Reply-To: <54F6D3B0.60600@gmail.com>

Anton Trunov <anton.a.trunov@gmail.com> writes:

Show 23 quoted lines

> For the code version before applying this patch the following scenario
> will take place if "git merge -Xignore-all-space remote" gets executed.
>
> base file:
> 1st line
> 2nd line
>
> master file:
>   1st line
>   2nd line with substantial change
>
> remote file:
>               1st line
>               2nd line
>
> merge result file:
>   1st line
>   2nd line with substantial change
>
> So essentially it does what "git merge -s ours remote" does in case if
> all their changes are trivial.
> This seems like reasonable solution to me: we _are_ trying to ignore
> whitespace changes and we are explicit about it.

Now, the above makes readers wonder what happens when you merged master into the remote. I.e. in the opposite direction.