-
Bug
-
Resolution: Unresolved
-
Critical
-
None
So i get this error:
Caused by: org.tmatesoft.svn.core.SVNException: svn: E155015: One or more conflicts were produced while merging r9715:10320 into ....
The problem is that 10320 is not the last revision number. The latest revision is 10958.
Why is it merging with 10320? How can i change this?
The plugin does not simply rebase with HEAD. Instead it rebase with the SVN revision ID used in a specific build of the upstream. You can configure the rebase action to use the last build or the last stable build.
You cannot change this but you can rebuild the upstream project. Or simply rebase manually.