Pull request still showing conflicts even when up to date

Hi,

I am unsure whether it is a bug or a misconfiguration so I put this here in case my issue on github is out of topic.

Describe the bug
Sometimes, when a branch is updated to fix merge conflicts, gogs doesn’t update the status and still refuses to automatically merge.

Gogs version and commit
Application version
0.12.3
Git version
2.17.1
Go version
go1.15
Build time
2020-10-07 03:03:48 UTC
Build commit
f0e3cd9

Operating system
DISTRIB_ID=Ubuntu
DISTRIB_RELEASE=18.04
DISTRIB_CODENAME=bionic
DISTRIB_DESCRIPTION=“Ubuntu 18.04.5 LTS”

Database
SQLite

To Reproduce
Steps to reproduce the behavior:

  1. Create a branch B from A branch, commit some patches, create a pull request to merge B into A
  2. Commit some patches in A branch that create conflicts
  3. Manually fix conflicts into B branch by issuing “git merge A”
  4. Push to publish new commit resolving conflicts into B branch onto the server
  5. Server still displays that the branch cannot be merged due to conflicts

Can you reproduce the bug at https://try.gogs.io?
No, I think this bug may be due to a configuration issue but I can’t find it

Expected behavior
Gogs automatically refreshes the conflict status to let us merge from the web page or lets us force refresh

Actual behavior
Gogs does not refresh the conflict status or thinks it’s still conflicting

Screenshots
image

Additional context
I tried:

  • Closing and reopening the pull request, no effect
  • Adding a commit, no effect
  • Emptying web browser cache, disconnecting/reconnecting, no effect
  • Firefox / Edge / Chrome present the same issue
  • I red all the logs and some errors show that SQLite database is locked sometimes but nothing else and nothing related to a pull request presenting the bug

Thank you for your help