Merge conflicts block the 'Mark as Manually Merged' operation #24729
Labels
issue/needs-feedback
For bugs, we need more details. For features, the feature must be described in more detail
type/bug
Comments
You think it's an regression? We did alter the PR merge box recently, so I suspect it came from that work, specifically #23951. |
|
I'm not sure whether it's a regression or not. In any case I feel that it would be prudent to always have the option to close a PR as 'manually merged', regardless of any background processing that might be going on. |
|
I guess it is a regression, I have left comments there
|
|
On my side, I can see the "manual merge" form. Do you have a reproducible example?
|
wxiaoguang
added
the
issue/needs-feedback
|
I think this already got resolved in the mean time. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Description
When a PR shows this message at the bottom:
it is no longer possible to mark the PR as 'manually merged'. This is the same for when the conflict checking is in progress, in such cases it's also impossible to just mark things as merged. Since conflict checking can take a lot of time, this is often a blocking issue for the Blender project.
Gitea Version
https://github.com/blender/gitea/tree/blender-merged tracking Gitea
mainat ce5d711Can you reproduce the bug on the Gitea demo site?
No
Log Gist
No response
Screenshots
No response
Git Version
No response
Operating System
No response
How are you running Gitea?
Running our own branch.
Database
PostgreSQL
The text was updated successfully, but these errors were encountered: