gitea: PR can't be merged after manual conflict resolution
- Gitea version (or commit ref): Commit: e6da2cf2cbff4d550cf938548233a59ceef6528e
- Git version: 2.7.4
- Operating system: Linux Mint 18
- Database (use
[x]):- PostgreSQL
- MySQL
- SQLite
Description
If I do a PR with conflicts, gitea says that I have to merge branch manually ( This pull request can't be merged automatically because there are conflicts. ). I’ve done it but the message does not disappear. I closed the PR, then reopened it and now if I go to the merge request I get the following message everytime:
The conflict checking is still in progress, please refresh page in few moments.
Steps to reproduce
- Create new PR with a conflict between the 2 branches
- Merge manually the branch fixing the conflicts
- Close the PR
- Reopen it
About this issue
- Original URL
- State: closed
- Created 8 years ago
- Comments: 33 (20 by maintainers)
Commits related to this issue
- Fixes issue #283 Delete old temp local copy before we create a new temp local copy — committed to Bwko/gitea by Bwko 8 years ago
- Fixes issue #283 Delete old temp local copy before we create a new temp local copy — committed to go-gitea/gitea by Bwko 8 years ago
- Changes from gitea:master (#130) * Bug fix for edit-hook API endpoint * Fixes issue #283 Delete old temp local copy before we create a new temp local copy * In the wiki title replace tab wit... — committed to ethantkoenig/gitea by ethantkoenig 7 years ago
I think GitHub marks as merged.
I’ll do it tomorrow!