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
On Wed, Mar 16, 2016 at 08:45:57AM -0400, Phil Susi wrote:
> 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
Stefan Beller writes:
> On Tue, Mar 15, 2016 at 10:27 AM, Phil Susi wrote:
>> I'm doing a rebase and got some conflicts. I just want to take their
>> version of all files, but git checkout --theirs complains:
>>
>> --ours/--theirs' cannot be used with
On Tue, Mar 15, 2016 at 10:27 AM, Phil Susi wrote:
> I'm doing a rebase and got some conflicts. I just want to take their
> version of all files, but git checkout --theirs complains:
>
> --ours/--theirs' cannot be used with switching branches
>
> What gives? I'm not
I'm doing a rebase and got some conflicts. I just want to take their
version of all files, but git checkout --theirs complains:
--ours/--theirs' cannot be used with switching branches
What gives? I'm not *trying* to switch branches. I just want to
resolve the conflict by taking their version.
5 matches
Mail list logo