Merge pull request #1787 from mikeattara/master

Request manual review of automerge PR if there is a merge conflict
Expensify · Mar 16, 2021 · 9fec61f · 9fec61f
2 parents 51d03c8 + e4eff6c
commit 9fec61f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -24,11 +24,12 @@ jobs:
               uses: hmarr/auto-approve-action@7782c7e2bdf62b4d79bdcded8332808fd2f179cd
               with:
                   github-token: ${{ secrets.GITHUB_TOKEN }}
-              if: github.event.label.name == 'automerge' && github.actor == 'OSBotify' && steps.changed.outputs.files_updated == 'android/app/build.gradle ios/ExpensifyCash/Info.plist ios/ExpensifyCashTests/Info.plist package-lock.json package.json' && steps.changed.outputs.files_created == '' && steps.changed.outputs.files_deleted == ''
+              if: github.event.pull_request.mergeable && github.event.label.name == 'automerge' && github.actor == 'OSBotify' && steps.changed.outputs.files_updated == 'android/app/build.gradle ios/ExpensifyCash/Info.plist ios/ExpensifyCashTests/Info.plist package-lock.json package.json' && steps.changed.outputs.files_created == '' && steps.changed.outputs.files_deleted == ''
 
             - name: Check for an auto merge
               # Version: 0.12.0
               uses: pascalgn/automerge-action@c9bd1823770819dc8fb8a5db2d11a3a95fbe9b07
+              if: github.event.pull_request.mergeable && github.event.pull_request.mergeable_state == 'clean'
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}