Merge conflicts block the 'Mark as Manually Merged' operation #10850

New Issue

GiteaMirror · 2025-11-02T09:19:59-06:00

GiteaMirror commented

2025-11-02 09:19:59 -06:00

Originally created by @drsybren on GitHub (May 15, 2023).

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

Originally created by @drsybren on GitHub (May 15, 2023). ### 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](https://projects.blender.org/blender/blender/). ### 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

GiteaMirror added the issue/needs-feedback type/bug labels 2025-11-02 09:19:59 -06:00

GiteaMirror closed this issue

2025-11-02 09:19:59 -06:00

GiteaMirror commented

2025-11-02 09:19:59 -06:00

@silverwind commented on GitHub (May 15, 2023):

it is no longer possible to mark the PR as 'manually merged'.

You think it's an regression? We did alter the PR merge box recently, so I suspect it came from that work, specifically https://github.com/go-gitea/gitea/pull/23951.

@silverwind commented on GitHub (May 15, 2023): > it is no longer possible to mark the PR as 'manually merged'. You think it's an regression? We did alter the PR merge box recently, so I suspect it came from that work, specifically https://github.com/go-gitea/gitea/pull/23951.

GiteaMirror commented

2025-11-02 09:20:00 -06:00

@drsybren commented on GitHub (May 15, 2023):

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.

@drsybren commented on GitHub (May 15, 2023): 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.

GiteaMirror commented

2025-11-02 09:20:00 -06:00

@wxiaoguang commented on GitHub (Jul 9, 2023):

I guess it is a regression, I have left comments there

@wxiaoguang commented on GitHub (Jul 9, 2023): I guess it is a regression, I have left comments there ![image](https://github.com/go-gitea/gitea/assets/2114189/8676ec13-7ee8-4b22-9b0a-a4d5fd36b060)

GiteaMirror commented

2025-11-02 09:20:00 -06:00

@wxiaoguang commented on GitHub (Jul 9, 2023):

On my side, I can see the "manual merge" form.

Do you have a reproducible example?

@wxiaoguang commented on GitHub (Jul 9, 2023): On my side, I can see the "manual merge" form. Do you have a reproducible example? ![image](https://github.com/go-gitea/gitea/assets/2114189/804becde-3496-4b9f-95ed-f46345445e93)

GiteaMirror commented

2025-11-02 09:20:00 -06:00

@drsybren commented on GitHub (Jul 10, 2023):

I think this already got resolved in the mean time.

@drsybren commented on GitHub (Jul 10, 2023): I think this already got resolved in the mean time.

Sign in to join this conversation.

Branches Tags

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/gitea#10850