gitea: Conflicting files shown on pull request but merging without conflict

• Gitea version (or commit ref): 1.12.5 and 1.14.0+dev-251-g78204a7a7
• Git version: 2.24.1
• Operating system:
• Database (use [x]):
  • PostgreSQL
  • MySQL
  • MSSQL
  • SQLite
• Can you reproduce the bug at https://try.gitea.io:
  • Yes (provide example URL)
  • No
• Log gist:

Description

I created a pull request which showed me that one of the files was conflicting. I then wanted to resolve this conflict locally but the merge worked just fine.

I re-created this on try.gitea.io with a simplified example, see this test repo: https://try.gitea.io/test-gitea3/conflict-test

Steps taken:

1. created initial version on master
2. created branch test
3. modified same file on branch test
4. modified same file on branch master
5. created PR

Result:

This pull request has changes conflicting with the target branch. settings.py

This is the output when merging locally:

$ git merge test
Auto-merging settings.py
Merge made by the 'recursive' strategy.
 settings.py | 41 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)