fix: use skipAutoMerge

christophehurpeau · Jun 28, 2019 · 4bf9c0a · 4bf9c0a
1 parent 12edae5
commit 4bf9c0a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/dist/index-node10-dev.cjs.js b/dist/index-node10-dev.cjs.js
diff --git a/dist/index-node10-dev.cjs.js.map b/dist/index-node10-dev.cjs.js.map
diff --git a/dist/index-node10.cjs.js b/dist/index-node10.cjs.js
diff --git a/dist/index-node10.cjs.js.map b/dist/index-node10.cjs.js.map
diff --git a/src/pr-handlers/edited.ts b/src/pr-handlers/edited.ts
@@ -16,8 +16,8 @@ export default function edited(app: Application): void {
           return;
         }
 
-        await editOpenedPR(context, repoContext);
-        await autoMergeIfPossible(context, repoContext);
+        const { skipAutoMerge } = await editOpenedPR(context, repoContext);
+        if (!skipAutoMerge) await autoMergeIfPossible(context, repoContext);
       },
     ),
   );