From: Phillip Susi <psusi@ubuntu.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: cherry-pick generates bogus conflicts on removed files
Date: Fri, 18 Oct 2013 09:25:33 -0400 [thread overview]
Message-ID: <526136CD.6080903@ubuntu.com> (raw)
In-Reply-To: <xmqqiowvy4zb.fsf@gitster.dls.corp.google.com>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 10/17/2013 5:14 PM, Junio C Hamano wrote:
> Correct.
>
> Without inspecting them, you would not know what you would be
> losing by blindly resolving to removal, hence we do not
> auto-resolve "one side removed, the other side changed" to a
> removal.
Even when I specify the "theirs" strategy? It seems like saying to
unconditionally accept their changes should not generate conflicts.
> That does not need to mean that we should not make it easier for
> the user to say "resolve these 'one side removed, the other side
> changed' paths to removal".
>
> "add -u" will be a way to say "Record the changes I made to my
> working tree files to the index". So presumably
>
> rm -f those files that the other branch removed git add -u
>
> would be one way to do so. Of course, you can also use "git rm"
> directly, i.e.
>
> git rm -f those files that the other branch removed
I have about two dozen such files. Are you saying I have to
individually remove each one?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (MingW32)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iQEcBAEBAgAGBQJSYTbNAAoJEJrBOlT6nu752lAH/33YymYr773UZY8ryioA7dkQ
he3qjYzxWdIY2FtNFfYER1o1Q7PpeDLvq61b67IZ2htFjiK4+xgM/q+wjp3RMkXI
sA2vQ9iNn8dvR+PlzR9DgOFcDD17p3Q/xbu3H/M4Nt+H3px+Yz6sjUUSOzDAzXl8
ADQe0g4KkQnY4fjx+iWbrygY5xXCaQ52693pwYvR67GijfYxIuNb4d9DpkZhyqIZ
L6qjJH4FR1AZl6n5hPj0a9ZitrO8J/MjJ24oLVBfBU2h1GF5h7LoavkU02S874BZ
/8fULrCYfTCMSkyOCnk2xCkhw3sbqU9vEu90npI5X1nRbZZ0ro/DPAjXCgHB40c=
=EB2w
-----END PGP SIGNATURE-----
next prev parent reply other threads:[~2013-10-18 13:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-17 19:58 cherry-pick generates bogus conflicts on removed files Phillip Susi
2013-10-17 21:14 ` Junio C Hamano
2013-10-18 13:25 ` Phillip Susi [this message]
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=526136CD.6080903@ubuntu.com \
--to=psusi@ubuntu.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.