Merge conflict during commit
From: Christophe Prud'homme <prudhomm_at_debian.org>
Date: 2003-04-30 19:28:18 CEST
Hi,
I've got this message in two different dirs in my svn tree
svn ci -m"my message here"
If I run commit individual files, no problem.
This problem started to appear after I created svn:ignore property for these dirs.
Best regards
-- | Christophe Prud'homme, http://augustine.mit.edu/~prudhomm | ICQ UIN: 24560867 Alias: Jesunix | Key fingerprint = 3703 50DE 7A9F 024E 0F26 0D07 A18F B40B D4BE 1450 | | If it doesn't work, force it. If it breaks, it needed replacing anyway. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org For additional commands, e-mail: dev-help@subversion.tigris.orgReceived on Wed Apr 30 19:30:51 2003 |
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.