RFR: 374: Do not show integration message when PR has merge conflict

[Robin Westberg]

Hi all,

Please review this change that waits with posting the integration ready message if a PR has a merge conflict.

Best regards,
Robin

-------------

Commit messages:
 - Don't say ready for integration if there is a conflict

Changes: https://git.openjdk.java.net/skara/pull/590/files
 Webrev: https://webrevs.openjdk.java.net/skara/590/webrev.00
  Issue: https://bugs.openjdk.java.net/browse/SKARA-374
  Stats: 30 lines in 2 files changed: 0 ins; 10 del; 20 mod
  Patch: https://git.openjdk.java.net/skara/pull/590.diff
  Fetch: git fetch https://git.openjdk.java.net/skara pull/590/head:pull/590

PR: https://git.openjdk.java.net/skara/pull/590