Content in local branche and new pull request differ


We are facing a very annoying bug with Gitea, when browsing a branch named dev on the web UI everything is fine in our files but when we create a PR from another branch named local-fonts the UI shows conflicts that doesn’t exist anymore:

Does someone already dealt with something like this?
Thanks in advance for your help.


Here is a screenshot of the content of the index.html file seen from the web UI on the dev branch:

You can see that match the content of the file on the local-fonts branch and there is in fact no conflicts as shown in the PR…

FYI I merged it from the command line: git checkout dev && git merge local-fonts and everything went well, no conflicts as shown by Gitea :roll_eyes: