Uploaded image for project: 'Jenkins'
  1. Jenkins
  2. JENKINS-38346

Rebase with upstream Subversion revision doesn't merge to HEAD

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Unresolved
    • Icon: Critical Critical
    • svnmerge-plugin
    • 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?

            kohsuke Kohsuke Kawaguchi
            luci0 Lucian Harhata
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

              Created:
              Updated: