Build Time: junit-top-level-build-time
Branch Name:
junit-branch-name
Branch GIT ID:
rebase-branch-git-commit
0 Jobs Passed.
2 Jobs Failed.
Completed with the status of FAILURE.
Please fix rebase errors on junit-pr-head-username/junit-pr-head-branch .
[exec] From github.com:michaelhashimoto/liferay-portal-ee
[exec] From github.com:michaelhashimoto/liferay-portal-ee
[exec] * [new branch] ee-6.2.x-qa-portal-rebase-error -> ee-6.2.x-temp-20151109122835277
[exec] * [new branch] ee-6.2.x-qa-portal-rebase-error -> ee-6.2.x-temp-20151109122835277
[exec] First, rewinding head to replay your work on top of it...
[exec] Applying: LRQA-TEST Portal rebase error
[exec] Using index info to reconstruct a base tree...
[exec] M git-commit-plugins
[exec] Falling back to patching base and 3-way merge...
[exec] Failed to merge in the changes.
[exec] Failed to merge in the changes.
[exec] Auto-merging git-commit-plugins
[exec] CONFLICT (content): Merge conflict in git-commit-plugins
[exec] Patch failed at 0001 LRQA-TEST Portal rebase error
[exec] The copy of the patch that failed is found in:
[exec] /opt/dev/projects/github/liferay-portal-ee-6.2.x/.git/rebase-apply/patch
[exec]
[exec] When you have resolved this problem, run "git rebase --continue".
[exec] If you prefer to skip this patch, run "git rebase --skip" instead.
[exec] To check out the original branch and stop rebasing, run "git rebase --abort".
[exec]
[exec] commit 3eec8429aa11cd42fb9c4a5da1d3d7081a08c8db
[exec] Author: Byran Zaugg <byran.zaugg@liferay.com>
[exec] Date: Fri Nov 6 16:29:51 2015 -0800
[exec]
[exec] LPS-59959 Update CKEditor 4.0.3 to 92bc3f6
[exec] To git@github.com:brianchandotcom/liferay-portal-ee.git
[exec] To git@github.com:brianchandotcom/liferay-portal-ee.git
[exec] * [new branch] ee-6.2.x-temp-20151109122835277 -> ee-6.2.x-temp-20151109122835277
[exec] * [new branch] ee-6.2.x-temp-20151109122835277 -> ee-6.2.x-temp-20151109122835277
[delete] Deleting: /opt/dev/projects/github/liferay-portal-ee-6.2.x/20151109122929662
BUILD FAILED
/opt/dev/projects/github/liferay-jenkins-ee/commands/build-test-portal-acceptance-pullrequest-source.xml:127: The following error occurred while executing this line:
/opt/dev/projects/github/liferay-jenkins-ee/commands/build-test-portal-acceptance-pullrequest-source.xml:103: The following error occurred while executing this line:
/opt/dev/projects/github/liferay-jenkins-ee/commands/build-common.xml:2092: Error on rebase of 'michaelhashimoto/ee-6.2.x-qa-portal-rebase-error' against 'ee-6.2.x'.