After clicking merge the PR stays open with message "This branch is already included in the target branch. There is nothing to merge".

[salamunjan]

Gitea Version

1.25.1

What happened?

After clicking merge the PR stays open with message "This branch is already included in the target branch. There is nothing to merge". The PR needs to be closed manually to get rid of the message.

How are you running Gitea?

Install method: Docker (Docker Compose stack),
Operating system:

• Host: Ubuntu 20.04.6 LTS (kernel 5.4.0-216, x86_64)
• Container: Alpine Linux 3.22 (the base of the official Gitea image),

Database: PostgreSQL postgres:18 image, running PostgreSQL 18.4 (Debian build)

[SudhanshuMatrix]

Can you provide a Screenshot if possible?

[bircni]

we do not support 1.25 anymore - could you please check if this still happens to you with 1.27?

[wxiaoguang]

I think I know the root cause.

The git repo status and db PR status sometimes can go out-of-sync. Especially in old releases, some ctx are abused, so a merge can have the git operation done but database operation fails.

Although the problem is mitigated in new Gitea releases, actually:

1. such edge can still happen sometimes
2. the out-of-sync git&db status can only be resolved manually. e.g.: close the PR or use the "manually merge" feature (enable it on repo setting pages)

[wxiaoguang]

Just FYI, a similar problem is this: PR information could be out of sync and stuck in a stale status #23084