-----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----- -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
