From: Phillip Susi <psusi@ubuntu.com>
To: git@vger.kernel.org
Subject: cherry-pick generates bogus conflicts on removed files
Date: Thu, 17 Oct 2013 15:58:30 -0400 [thread overview]
Message-ID: <52604166.8000501@ubuntu.com> (raw)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
I have a commit I am trying to cherry pick that removes a number of
files. It seems to generate conflicts for those files that have been
modified on this branch since the common ancestor. Since they are
being removed, I don't care about what changes have been made on this
branch, just remove them. Even git cherry-pick -Xtheirs does not
help. How can I avoid these conflicts, or accept the deletions? I
tried git add -u, but that seems to take my version rather than accept
the deletion, and there is no -u switch to git rm.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (MingW32)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iQEcBAEBAgAGBQJSYEFlAAoJEJrBOlT6nu75kSEIAMjqXl6nhfEhIMC66Zh4W/y0
MZ/+acDUNdvpCDtEpf9nPIFBQUKxdqAhUg0qYLSOvdvhQIvxkgo6nMo15MAA5Dd/
jNPZD78m0qwvNooUhFiHdqSEwob+2ntA9/VVP+LgCsRcK6BUqHs1Z3MKbe4vXPYr
+/bs11daxcnHH81aXOwRcOlUZRsG+yCDQiD9qjhPyv0BCCdS9splC+R7JZy4VaYb
6GQ03G7oY0yFGV9UAOXD1OqDwVPc30tinXlCM2GaBQNc11IQzpi813nEyxTOaf3Z
P5BXXH5ZzDNQS5F6Dn/VVNM6MMxVugIgGJafd4EkJiRHw4fIcUCX3/aeDoEDHlc=
=uy2D
-----END PGP SIGNATURE-----
next reply other threads:[~2013-10-17 19:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-17 19:58 Phillip Susi [this message]
2013-10-17 21:14 ` cherry-pick generates bogus conflicts on removed files Junio C Hamano
2013-10-18 13:25 ` Phillip Susi
2013-10-22 17:01 ` Junio C Hamano
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=52604166.8000501@ubuntu.com \
--to=psusi@ubuntu.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).