Hello,

I have a problem using svnmerge. after merging from trunk to branch i get a 
conflict that i resolve by choosing mine.
Then on the merge back to trunk i still get a conflict. This doesn't happen 
when using Tortoise.

Please Advice,

Thanks,
gzd


 
____________________________________________________________________________________
It's here! Your new message!  
Get new email alerts with the free Yahoo! Toolbar.
http://tools.search.yahoo.com/toolbar/features/mail/

_______________________________________________
Svnmerge mailing list
[email protected]
http://www.orcaware.com/mailman/listinfo/svnmerge

Reply via email to