Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MarkusAmshove opened this issue Apr 24, 2019 · 3 comments
Closed
Labels
issue/needs-feedback For bugs, we need more details. For features, the feature must be described in more detail

Comments

@MarkusAmshove
Copy link
Contributor

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

@lafriks
Copy link
Member

lafriks commented Apr 25, 2019

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

@lafriks lafriks added the issue/needs-feedback For bugs, we need more details. For features, the feature must be described in more detail label Apr 25, 2019
@MarkusAmshove
Copy link
Contributor Author

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

@lafriks
Copy link
Member

lafriks commented Apr 30, 2019

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

@lafriks lafriks closed this as completed Apr 30, 2019
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
issue/needs-feedback For bugs, we need more details. For features, the feature must be described in more detail
Projects
None yet
Development

No branches or pull requests

2 participants