Content in local branche and new pull request differ

Install/Maintain/Configure
1

Hi,

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:

25
Screen Shot 2019-09-23 at 17.46.25.png1658×914 99.8 KB

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

Best,

2

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

08
Screen Shot 2019-09-23 at 17.51.08.png1000×378 26.6 KB

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…

3

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:

4

Hi @mathilde, did you get any resolution to this - I’m having the same issue?

5

Hey @clintwood

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.

Best,

6

@mathilde, Yeah I’m doing the same - thanks!