Status: Closed (View Workflow)
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.
Bue Petersen added a comment -
Failing git merges will now more clearly report the exit code of git merge and the original error message.
Bue Petersen added a comment - Failing git merges will now more clearly report the exit code of git merge and the original error message.
Code changed in jenkins
User: Bue Petersen
JENKINS-27690, JENKINS-27662, JENKINS-27697: checkstyle fixes
Fixed some checkstyle warnings to pass thressholds.