John Gibson
commented on JENKINS-10718
Git plugin: show conflicting files if pre-build merge fails
I'd be in favor of simply printing the output of the merge command in the log (or really any command that fails). In my case the merge was failing because the Jenkins user didn't have a git identity configured. I had to login as jenkins and run the command myself to diagnose the issue:
jenkins@somewhere.invalid $ /usr/bin/git merge 1234567890abcde1234567890abcde1234567890
*** Please tell me who you are.
Run
git config --global user.email "y...@example.com"
git config --global user.name "Your Name"
to set your account's default identity.
Omit --global to set the identity only in this repository.
fatal: empty ident not allowed
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira
--
You received this message because you are subscribed to the Google Groups "Jenkins Issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
