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
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
Hi @mathilde, did you get any resolution to this - I’m having the same issue?
As mentioned before I didn’t succeeded to make it work on Gitea, the bug still exist. However, doing the job with the command line works.
@mathilde, Yeah I’m doing the same - thanks!