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

          Hide
          scm_issue_link SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Bue Petersen
          Path:
          src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/AccumulatedCommitStrategy.java
          src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/SquashCommitStrategy.java
          http://jenkins-ci.org/commit/pretested-integration-plugin/bba993008f51195ebf913d760d405d7b28aa5ad6
          Log:
          JENKINS-27690,JENKINS-27662,JENKINS-27697: checkstyle fixes

          Fixed some checkstyle warnings to pass thressholds.

          Show
          scm_issue_link SCM/JIRA link daemon added a comment - Code changed in jenkins User: Bue Petersen Path: src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/AccumulatedCommitStrategy.java src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/SquashCommitStrategy.java http://jenkins-ci.org/commit/pretested-integration-plugin/bba993008f51195ebf913d760d405d7b28aa5ad6 Log: JENKINS-27690 , JENKINS-27662 , JENKINS-27697 : checkstyle fixes Fixed some checkstyle warnings to pass thressholds.
          Hide
          bue Bue Petersen added a comment -

          Failing git merges will now more clearly report the exit code of git merge and the original error message.

          Show
          bue Bue Petersen added a comment - Failing git merges will now more clearly report the exit code of git merge and the original error message.

            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: