On Tue, Mar 15, 2016 at 10:27 AM, Phil Susi <phillsusi@xxxxxxxxx> 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 *trying* to switch branches. I just want to
> resolve the conflict by taking their version. If I try git checkout
> --theirs ., then it complains that not every single file in the
> directory has a "their" version. So? Take the ones that do.
I think for checking out files you'd need to add the file names.
In case of a collision between branch name and file name, even add
a double dash:
git checkout --theirs -- file/name
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html