Mergeability of PRs is not updated when target branch got updates #3241

New Issue

GiteaMirror · 2025-11-02T05:05:12-06:00

GiteaMirror commented

2025-11-02 05:05:12 -06:00

Originally created by @markusamshove on GitHub (Apr 24, 2019).

Tested on Gitea 1.8.0

Currently the status if a PR has conflicts to the target branch is not updated when there are new commits pushed to the target branch.

Scenario:

I branch off from master to implement a feature. When the feature is implemented, I first want to merge it into a QA branch via PR.
If master and QA have diverged too much (e.g. a lot of testing at the moment), I get conflicts from feature to QA, which is expected.

However, if I then merge master into QA the conflicts might be resolved.
When I now look into the PR, it still says it has the same conflicts as before, which led me to the conclusion that the mergeability is not evaluated again if there are updates to the target branch.

I think this would be a great QoL feature

Originally created by @markusamshove on GitHub (Apr 24, 2019). Tested on Gitea 1.8.0 Currently the status if a PR has conflicts to the target branch is not updated when there are new commits pushed to the target branch. Scenario: I branch off from master to implement a feature. When the feature is implemented, I first want to merge it into a QA branch via PR. If master and QA have diverged too much (e.g. a lot of testing at the moment), I get conflicts from feature to QA, which is expected. However, if I then merge master into QA the conflicts might be resolved. When I now look into the PR, it still says it has the same conflicts as before, which led me to the conclusion that the mergeability is not evaluated again if there are updates to the target branch. I think this would be a great QoL feature

GiteaMirror added the issue/needs-feedback label 2025-11-02 05:05:12 -06:00

GiteaMirror closed this issue

2025-11-02 05:05:12 -06:00

GiteaMirror commented

2025-11-02 05:05:13 -06:00

@lafriks commented on GitHub (Apr 25, 2019):

I can not reproduce this. Can you create such example in try.giyea.io?

@lafriks commented on GitHub (Apr 25, 2019): I can not reproduce this. Can you create such example in try.giyea.io?

GiteaMirror commented

2025-11-02 05:05:13 -06:00

@markusamshove commented on GitHub (Apr 29, 2019):

After testing it a bit more, I think it is more likely a cause of #6417 (using apply instead of merge), so that it seems like the PR isn't updated

@markusamshove commented on GitHub (Apr 29, 2019): After testing it a bit more, I think it is more likely a cause of #6417 (using `apply` instead of `merge`), so that it *seems* like the PR isn't updated

GiteaMirror commented

2025-11-02 05:05:13 -06:00

@lafriks commented on GitHub (Apr 30, 2019):

Even through a bit different fixing that should fix also this use case so closing this

@lafriks commented on GitHub (Apr 30, 2019): Even through a bit different fixing that should fix also this use case so closing this

GiteaMirror referenced this issue

2025-11-02 12:20:21 -06:00

[PR #3241] [MERGED] Fix repo-transfer-and-team-repo-count bug #16841

GiteaMirror referenced this issue

2025-11-02 12:20:23 -06:00

[PR #3244] [MERGED] Fix repo-transfer-and-team-repo-count bug (#3241) #16843

Sign in to join this conversation.