Geek Answers Handbook

Resolve all conflicts and try merging again to apply the rest of the automatic merge Script

We have an automatic batch of Script, which takes care of the merger and displays the entire log (conflicts) in a text file for developers to get the appropriate visibility. Now the problem sometimes stops between them and gives the following error svn: E155015: during the merge, one or more conflicts were created. Resolve all conflicts and try merging again to apply the remaining script in the automatic merge. The following 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 many ways to fix this, but didn’t have time.

Relations Pravin

+4
source share
2 answers

This happens when some of the commits have already been "selected from cherry", i.e. combined using the flag -r x:y. In this case, subversion first combines everything before xand than everything above y. If the merge xfails, it gives this error.

I do not think you should work on this. If you want to merge, just do it manually. If you do not, just tell the script to stop the attempt.

+2
source

I would try to add parameters:

--accept=postpone

svn merge, , , . , --non-interactive , . , , 2>&1, , , . , :

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

More articles:


All Articles