Explanation on the conflict and "svn resolve" functionnality
From: Alexis Boutillier <alexis.boutillier_at_arteris.net>
Date: 2004-04-06 12:19:54 CEST
I would like to understand how do the conflict and revert functionnality
I had a conflict on a file and see that it creates two files with the
I thinked that the conflict flag was in the svn entries to indicate that
I thinked it is dangerous to allow the resolution of a conflict by only
What do you think of that ?
-- Boutillier Alexis Methodology engineer Arteris SA The Network-on-Chip Company (TM) www.arteris.net 6 parc Ariane Immeuble Mercure 78284 Guyancourt Cedex France Office: (+33) 1 61 37 38 71 Fac: (+33) 1 61 37 38 41 Alexis.Boutillier@arteris.net --------------------------------------------------------------------- To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org For additional commands, e-mail: users-help@subversion.tigris.orgReceived on Tue Apr 6 12:21:30 2004 |
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.