-----BEGIN PGP SIGNED MESSAGE-----
On 10/17/2013 5:14 PM, Junio C Hamano wrote:
> 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
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/
-----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