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
['https://Stackoverflow.com/questions/20473565', 'https://Stackoverflow.com', 'https://Stackoverflow.com/users/2971999/']
This happens when some of the commits were already "cherry-picked", i.e. merged using the `-r x:y` flag. In such case subversion first merges everything up to `x` and than everything above `y`. If merging `x` fails, it gives this error.

I don't think you should be working around it. If you want to do the merge, just do it manually. If you don't, just tell the script to stop trying.
I would try adding the parameters: 

```
--accept=postpone

```

I use this for running `svn merge` and what it will do is add conflict markers to the files, but should always return. I'm surprised that the `--non-interactive` flag doesn't do this automatically though. The other thing to try is amend the redirection to include `2>&1` which will also redirect standard error, in case there's a warning that isn't being caught in the log file. So your new command becomes: 

```
svn merge http://xyzBranch.local.com C:\WORKSPACE\Trunk\ --username=xyz--password=zyz --non-interactive --accept=postpone >> C:\mergelogs\logs 2>&1

```