Please fix rebase errors on junit-pr-head-username/junit-pr-head-branch .

     \[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