[Svnmerge] Conflicts on the svnmerge-integrated property

[golan davidovits]

Hello,

Thanks for all the replies about the maual change post merge situation.
I'm trying to work with svnmerge script in merges between trunk and my private branch
but I'm getting conflicts on the svnmerge-integrated property in each merge.

What causes this behavior? 

Thanks,
gzd


 
____________________________________________________________________________________
8:00? 8:25? 8:40? Find a flick in no time 
with the Yahoo! Search movie showtime shortcut.
http://tools.search.yahoo.com/shortcuts/#news