syncNextPullRequest task blocks other builds when there is a merge conflict

[stealthcode]

Sync task needs to try to merge the first valid pull request then if that fails with a merge conflict, try the next pull request.

This was found in the previous version so this may already have been fixed. Jenkins output pasted below.

EDGE-Master-Detect-Pull-Request job # 39930

:syncNextPullRequest (Thread[main,5,main]) started.
:syncNextPullRequest
Executing task ':syncNextPullRequest' (up-to-date check took 0.0 secs) due to:
  Task has not declared any outputs.
checking for open pull requests
Finding Pull Requests targeting master.
GET: 
/rest/api/1.0/projects/EDGE/repos/server/pull-requests/
GET: 
/rest/build-status/1.0/commits/19daa9f ...[OMITTED]
buildStatus = needs build
Processing git sync for pull request id 1150
checkoutDir = /mnt/builds/slave/workspace/EDGE-Master-Detect-Pull-Request
[CMD] /mnt/builds/slave/workspace/EDGE-Master-Detect-Pull-Request: git fetch origin
[CMD] /mnt/builds/slave/workspace/EDGE-Master-Detect-Pull-Request: git checkout origin/feature-mediaroom-auth
[CMD] Previous HEAD position was 58fdebe... Merge remote-tracking branch 'origin/master' into HEAD
[CMD] HEAD is now at 19daa9f... EDGE-1494: Restored the FP to gate the mediaroom auth
[CMD] /mnt/builds/slave/workspace/EDGE-Master-Detect-Pull-Request: git merge origin/master --commit
 ...[OMITTED]
[CMD] Auto-merging  ...[OMITTED]
[CMD] CONFLICT (content): Merge conflict in  ...[OMITTED]
[CMD] Automatic merge failed; fix conflicts and then commit the result.
Error in processing git sync err  ...[OMITTED]
could not execute git commands : External process git merge origin/master --commit in /mnt/builds/slave/workspace/EDGE-Master-Detect-Pull-Request failed to return a 0 exit code.
GET: 
/rest/build-status/1.0/commits/98d41556 ...[OMITTED]
buildStatus = needs build
Finished task SyncNextPullRequestTask.
:syncNextPullRequest (Thread[main,5,main]) completed. Took 3.131 secs.

BUILD SUCCESSFUL

[jmcgarr]

Hey @dzapata do you know if this is still an issue for you guys?