[Svnmerge] problem using svnmerge

[Blair Zajac]

golan davidovits wrote:
> 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

Can you give the exact commands you run to set up the branch, trunk and 
use svnmerge?

Regards,
Blair

-- 
Blair Zajac, Ph.D.
CTO, OrcaWare Technologies
<blair at orcaware.com>
Subversion training, consulting and support
http://www.orcaware.com/svn/