From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Apr 2016 22:40:11 GMT
Subject: Re: Merge conflicts are reported relative to root not cwd
Message-ID: <xmqqvb3li14k.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <CAGZ79kZSyLZxMXSSv=uDpuA0zTUy6nU4vwEF5f7WLhoRp1hXig@mail.gmail.com>

Stefan Beller <sbeller@google.com> writes:

> * .... What are
>    whole-tree operations?

"git merge" does not let you merge "changes just in my current
directory".  You only merge the whole tree, and you can get
conflicts from all over the tree, not just in your current
directory.