From: Phil Susi <phillsusi@gmail.com>
Date: Wed, 16 Mar 2016 12:45:57 GMT
Subject: Re: git checkout --theirs fails
Message-ID: <56E95585.30409@gmail.com>
In-Reply-To: <xmqqd1qv76rn.fsf@gitster.mtv.corp.google.com>

On 3/15/2016 5:47 PM, Junio C Hamano wrote:
> would fail when the path file/name is unmerged and does not have
> stage #3 entry, wouldn't it?  So with ".", unless all paths that
> match that pathspec (i.e. all available files) are either merged
> (i.e. without conflict) or have stage #3 entry, it is expected that
> the command would fail consistently to the case where a pathspec
> "file/name" that happens to match only one path is given, and that
> is the behaviour Phil saw, I would think.

Right... why is this though?  Why doesn't it just check out those files
that *do* have a #3 entry?  And also why the nonsense about switching
branches when you don't specify any path or branch?