Disallow merging except canceling the auto merge status

[lunny]

Before:
Users can click merge button even if a pull request is on the automerge status

After:
Users have to cancel the automerge status before click merge button.

[wxiaoguang]

Why it should force users to use one more step to cancel?

I don't see anything wrong by allowing the merge without cancel.

[lunny]

Why it should force users to use one more step to cancel?

I don't see anything wrong by allowing the merge without cancel.

This is following GH's design.

[wxiaoguang]

Why it should force users to use one more step to cancel?
I don't see anything wrong by allowing the merge without cancel.

This is following GH's design.

Why GitHub is right?

[lunny]

In fact we need a state which indicates the checking is running, otherwise if the automerge checking is running and someone merge the pull request manually. Some inconsistent state of this pull request will be occupied.

[wxiaoguang]

In fact we need a state which indicates the checking is running, otherwise if the automerge checking is running and someone merge the pull request manually. Some inconsistent state of this pull request will be occupied.

It is a new problem and it is not related to this PR. Even if you take this PR, then think about this case:

1. User A opens the PR page, see the "merge" button
2. User B opens the PR page and sets to "auto merge"
3. Then User A clicks the "merge" button

The reason is the same.

---

So, if you would like to completely resolve the problem, I think it should also do something in backend code and add some tests.

[lunny]

In fact we need a state which indicates the checking is running, otherwise if the automerge checking is running and someone merge the pull request manually. Some inconsistent state of this pull request will be occupied.

It is a new problem and it is not related to this PR. Even if you take this PR, then think about this case:

1. User A opens the PR page, see the "merge" button

2. User B opens the PR page and sets to "auto merge"

3. Then User A clicks the "merge" button

The reason is the same.

So, if you would like to completely resolve the problem, I think it should also do something in backend code and add some tests.

Yes, I will continue to this PR.