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

PR build fails with 'merge conflicts' error when there are no merge conflicts

XMLWordPrintable

      Here is the scenario:

      The pull request on github says that there are no merge conflicts. Cloning the repo locally and merging the two branches also does not result in merge conflicts.

      But, when the PR build of job on the 'Github organization' job type is run, it shows that there is a merge conflict. Here is the output:

      ```
      hudson.plugins.git.GitException: Command "git merge 8b64e2f2ac7cb47ea99f267bbfa05fac17259277" returned status code 128:
      stdout:
      stderr: error: 'merge' is not possible because you have unmerged files.
      hint: Fix them up in the work tree,
      hint: and then use 'git add/rm <file>' as
      hint: appropriate to mark resolution and make a commit,
      hint: or use 'git commit -a'.
      fatal: Exiting because of an unresolved conflict.
      ```

          [JENKINS-47737] PR build fails with 'merge conflicts' error when there are no merge conflicts

          Pavan Tej Medapuram created issue -
          Pavan Tej Medapuram made changes -
          Summary Original: PR build fails with 'merge conflicts' issue when there are no merge conflicts New: PR build fails with 'merge conflicts' error when there are no merge conflicts
          Stephen Connolly made changes -
          Link New: This issue is related to JENKINS-44598 [ JENKINS-44598 ]
          Stephen Connolly made changes -
          Resolution New: Duplicate [ 3 ]
          Status Original: Open [ 1 ] New: Closed [ 6 ]

            Unassigned Unassigned
            teju009 Pavan Tej Medapuram
            Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

              Created:
              Updated:
              Resolved: