Hi,
I would like to inform the developer when there are conflicts in pull request build.
The problem is that it fails in SCM plugin, any idea how to continue or to notify on conflicts?
For example:
12:02:22 stdout: Auto-merging e.b 12:02:22 CONFLICT (content): Merge conflict in e.b 12:02:22 Automatic merge failed; fix conflicts and then commit the result. 12:02:22 12:02:22 stderr: 12:02:22 at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2450) 12:02:22 at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:2051) 12:02:22 at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:1951) 12:02:22 at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:1942) 12:02:22 at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.access$600(CliGitAPIImpl.java:84) 12:02:22 at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:910) 12:02:22 at jenkins.plugins.git.MergeWithGitSCMExtension.decorateRevisionToBuild(MergeWithGitSCMExtension.java:121) 12:02:22 at hudson.plugins.git.GitSCM.determineRevisionToBuild(GitSCM.java:1159) 12:02:22 at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1298) 12:02:22 at org.jenkinsci.plugins.workflow.steps.scm.SCMStep.checkout(SCMStep.java:125) 12:02:22 at org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition.create(CpsScmFlowDefinition.java:155) 12:02:22 at org.jenkinsci.plugins.workflow.multibranch.SCMBinder.create(SCMBinder.java:142) 12:02:22 at org.jenkinsci.plugins.workflow.job.WorkflowRun.run(WorkflowRun.java:309) 12:02:22 at hudson.model.ResourceController.execute(ResourceController.java:97) 12:02:22 at hudson.model.Executor.run(Executor.java:429) 12:02:22 [Bitbucket] Notifying pull request build result 12:02:23 [Bitbucket] Build result notified 12:02:23 ERROR: Maximum checkout retry attempts reached, aborting 12:02:23 Finished: FAILURE
BTW, Jenkinsfile has post with always to print something but never prints in conflicts
Thought if this cannot be handled inside plugin configuration, if pipeline will continue I would be able to catch the conflicts token failure.
Any idea?
Thanks,
Limor