Re: git checkout --theirs fails

2016-03-19 Thread Phil Susi
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

Re: git checkout --theirs fails

2016-03-19 Thread Jeff King
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

Re: git checkout --theirs fails

2016-03-15 Thread Junio C Hamano
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

Re: git checkout --theirs fails

2016-03-15 Thread Stefan Beller
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

git checkout --theirs fails

2016-03-15 Thread Phil Susi
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.