Thanks for your feeedback. I'm linking the issue to our internal tracker.

Please supply further information, like:

• using master? slaves?
• operating systems, git version?
• are you using multiscm, several git repositories?

I will very much like to test your scenario and use-case further. If the branch you try to merge branched from master? Or is there a more complex branch graph?

I need to write a test for it so we can fix it.

Console log, or snippets of it in an anonymous way would be good help also.

This is a console log of a failed merge the integration branch is myIntegrationBranch and the branch to be merged (origin/ready/testability) is definitly merge conflict free and only made a change to a text file. It was based on myIntegrationBranch and only has one additional commit.

From the error message it looks as if the merge failed even though I cannot find the actual merge call. Is there a way to reproduce the merge call as it is done by the pretested integration plugin? I managed to merge the feature branch into the integration branch without any errors using git merge but it does not seem as if this is the call used to merge.

Thanks, I will get back to you with instruction on how to get more logging.

I'm investigating a regressions issue, possible related to this issue where the plugin hangs. It seems, for now to be a problem in the combination of plugin v. 2.2.1 and Jenkins LTS from a certain version.

Reference to other issue: JENKINS-27328

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 support@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 <Joh@praqma.net> Date: Fri Mar 06 02:30:25 2015 +0100 Updated info file 5. time on branch ready/teamFeature commit 126ee365f36cbc991e4feb8d579ceedb9c737875 Author: ReleasePraqma <release@praqma.net> Date: Fri Mar 06 02:30:25 2015 +0100 Merge commit '9aa057053388508f0c353eb56ed6985a3da536bb' into ready/teamFeature commit cbe04ecab067454aadddc4f8943cb14016092ae0 Author: john Doe <Joh@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 <Joh@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 <Joh@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

This issue could be related to JENKINS-27662.

If we don't get further feedback on this issue, we will resolve as dublicate of JENKINS-27662.

I think the real problem is the reporting of merge errors from the plugin.

See JENKINS-27690.