From 53f0db39b929d666515e268ae65f8061edabbb48 Mon Sep 17 00:00:00 2001 From: Kyle Spier-Swenson Date: Sat, 22 Apr 2017 11:45:57 -0700 Subject: [PATCH] Merge conflict tags aren't touched if github doesn't calculate them in time --- tools/github_webhook_processor.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/github_webhook_processor.php b/tools/github_webhook_processor.php index 07d2d4c23c8..c2f888603ad 100644 --- a/tools/github_webhook_processor.php +++ b/tools/github_webhook_processor.php @@ -141,9 +141,9 @@ function tag_pr($payload, $opened) { $remove = array(); $mergeable = $payload['pull_request']['mergeable']; - if($mergeable == null || $mergeable) //only look for the false value + if($mergeable === TRUE) //only look for the false value $remove[] = 'Merge Conflict'; - else + else if ($mergable === FALSE) $tags[] = 'Merge Conflict'; if(has_tree_been_edited($payload, '_maps'))