[Integrated] RFR: 231: The merge bot cannot create merge conflict PRs

[Erik Helin]

Changeset: a667c285
Author:    Erik Helin <ehelin at openjdk.org>
Date:      2020-01-17 09:40:57 +0000
URL:       https://git.openjdk.java.net/skara/commit/a667c285

231: The merge bot cannot create merge conflict PRs

Reviewed-by: rwestberg

! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBot.java
! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBotFactory.java
! bots/merge/src/test/java/org/openjdk/skara/bots/merge/MergeBotTests.java
! test/src/main/java/org/openjdk/skara/test/TestHost.java
! test/src/main/java/org/openjdk/skara/test/TestHostedRepository.java
! test/src/main/java/org/openjdk/skara/test/TestPullRequest.java
! vcs/src/main/java/org/openjdk/skara/vcs/Repository.java
! vcs/src/main/java/org/openjdk/skara/vcs/git/GitRepository.java
! vcs/src/main/java/org/openjdk/skara/vcs/hg/HgRepository.java
! vcs/src/test/java/org/openjdk/skara/vcs/RepositoryTests.java