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

          bue Bue Petersen created issue -
          bue Bue Petersen made changes -
          Field Original Value New Value
          Summary Improve log output if git merge fails Improve log output if git merge fails (Praqma case 12876)
          bue Bue Petersen made changes -
          Status Open [ 1 ] In Progress [ 3 ]
          bue Bue Petersen made changes -
          Status In Progress [ 3 ] Open [ 1 ]
          bue Bue Petersen made changes -
          Status Open [ 1 ] In Progress [ 3 ]
          bue Bue Petersen made changes -
          Status In Progress [ 3 ] Open [ 1 ]
          bue Bue Petersen made changes -
          Resolution Fixed [ 1 ]
          Status Open [ 1 ] Resolved [ 5 ]
          bue Bue Petersen made changes -
          Assignee Praqma Support [ praqma ] Bue Petersen [ bue ]
          Status Resolved [ 5 ] Closed [ 6 ]
          rtyler R. Tyler Croy made changes -
          Workflow JNJira [ 161938 ] JNJira + In-Review [ 208590 ]

            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: