We have a automated batch Script which takes care of merge and outputs all the log (conflicts) in a text file for developers to get proper visibility.
Now the problem is sometimes it stops in between and gives the below error
svn: E155015: One or more conflicts were produced while merging Resolve all conflicts and rerun the merge to apply the remaining In autoated Merge Script
Below is the command
svn merge http://xyzBranch.local.com C:\WORKSPACE\Trunk\ --username=xyz--password=zyz --non-interactive >> C:\mergelogs\logs
Any help would be appreciated I tried a lot of ways to fix this but no success
Regards Pravin