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

Improve log output if git merge fails (Praqma case 12876)

    XMLWordPrintable

    Details

    • Similar Issues:

      Description

      If the merge fails, you might see the following message in the console (accumulated strategy):

      Failed to merge changes.
      merge: failure - not something we can merge
      

      The first line comes from our plugin, and second one comes from git and is the reason why the merge fails.
      This isn't obvious.

        Attachments

          Activity

            People

            Assignee:
            bue Bue Petersen
            Reporter:
            bue Bue Petersen
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

              Dates

              Created:
              Updated:
              Resolved: