ignoring tree-conflicts during merge
From: Neels Janosch Hofmeyr <neels_at_elego.de>
Date: Tue, 16 Jun 2009 23:23:55 +0200
Hi guys,
I'd like to renew an old question, since I can't find any final conclusion
Are we still positive that skipping tree-conflicts detection during merge
And, that a way to skip TC detection during merge is yet a missing feature?
I've also got this snippet from notes/tree-conflicts/detection.txt:
[[[
During an update or switch, we skip tree conflict detection if the
During a merge, we skip tree conflict detection if the record_only
=========================
Thanks for any comments.
------------------------------------------------------
|
This is an archived mail posted to the Subversion Dev mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.