|
||||||||
|
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.
Can you try to enable the logging plugin to get more information from logging on the slaves?
https://wiki.jenkins-ci.org/display/JENKINS/Logging+Plugin
It will catch your logs on the slaves.
Logging specifically on the pretested integration plugin, use this namespace: org.jenkinsci.plugins.pretestedintegration
It should supply us with more information. If you won't share with community, you can send it to us on supp...@praqma.net with reference to this case. I will have a look at it.
For now, you are the only one reporting problems with the merge.
By the way, here is an example list of git commands used from the plugin - you could try them:
git checkout -B master origin/master
git pull origin master
git merge -m "Accumulated commit of the following from branch 'origin/ready/teamFeature': commit ab22116e7c135b57771c3fe740b5c1c78610df7a Author: john Doe <j...@praqma.net> Date: Fri Mar 06 02:30:25 2015 +0100 Updated info file 5. time on branch ready/teamFeature commit 126ee365f36cbc991e4feb8d579ceedb9c737875 Author: ReleasePraqma <rele...@praqma.net> Date: Fri Mar 06 02:30:25 2015 +0100 Merge commit '9aa057053388508f0c353eb56ed6985a3da536bb' into ready/teamFeature commit cbe04ecab067454aadddc4f8943cb14016092ae0 Author: john Doe <j...@praqma.net> Date: Fri Mar 06 02:30:24 2015 +0100 4. time updating info file on branch ready/teamFeature commit 24365566f7828e9cae95fbbd31e6585b2f6764ed Author: john Doe <j...@praqma.net> Date: Fri Mar 06 02:30:24 2015 +0100 Updated info file again on branch ready/teamFeature - my first change is about this - my next change is a refactor. commit b77e511955bfdb435a3ff9284c50c7b0aca3bb0a Author: john Doe <j...@praqma.net> Date: Fri Mar 06 02:30:24 2015 +0100 Updated info file on branch ready/teamFeature " ab22116e7c135b57771c3fe740b5c1c78610df7a --no-ff
git push origin master
git push origin :ready/teamFeature