commit bfb46ebb66e912a5628c31bcde8ef21d01ba2da2
author zengk95 <34172846+zengk95@users.noreply.github.com> Mon Jun 13 20:36:12 2022 +0000
committer PyTorch MergeBot <pytorchmergebot@users.noreply.github.com> Mon Jun 13 20:36:12 2022 +0000
tree 47326d50edfdca0d0ef876cac05c51864fd488f7
parent 70810a3691ee3199cb4c18979a76654ded42fc3b

[mergebot] Add return on force (#79450)

See title
Pull Request resolved: https://github.com/pytorch/pytorch/pull/79450
Approved by: https://github.com/clee2000, https://github.com/janeyx99

.github/scripts/trymerge.py

diff --git a/.github/scripts/trymerge.py b/.github/scripts/trymerge.py
index 8014cb3..61234e3 100755
--- a/.github/scripts/trymerge.py
+++ b/.github/scripts/trymerge.py
@@ -930,7 +930,7 @@
     pr = GitHubPR(org, project, pr_num)
     initial_commit_sha = pr.last_commit()['oid']
     if force:
-        pr.merge_into(repo, dry_run=dry_run, force=force, comment_id=comment_id)
+        return pr.merge_into(repo, dry_run=dry_run, force=force, comment_id=comment_id)
     if (datetime.utcnow() - pr.last_pushed_at()).days > stale_pr_days:
         raise RuntimeError("This PR is too stale; the last push date was more than 3 days ago. Please rebase and try again.")