From: Phil Susi <phillsusi@gmail.com>
To: git@vger.kernel.org
Subject: git checkout --theirs fails
Date: Tue, 15 Mar 2016 13:27:12 -0400 [thread overview]
Message-ID: <56E845F0.9020609@gmail.com> (raw)
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.
next reply other threads:[~2016-03-15 17:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-15 17:27 Phil Susi [this message]
2016-03-15 21:35 ` git checkout --theirs fails Stefan Beller
2016-03-15 21:47 ` Junio C Hamano
2016-03-16 12:45 ` Phil Susi
2016-03-16 21:12 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56E845F0.9020609@gmail.com \
--to=phillsusi@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.