Closed
Description
Description
When a PR shows this message at the bottom:
This pull request has changes conflicting with the target branch.
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 main
at ce5d711
Can 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