There are merge conflicts

Hi! have an issue with gitlab merge requests.
When i create any mr in repo - gitlab says “There are merge conflicts” but there is no.

I just making a new branch by
git checkout -b ‘some/test-branch’

make some dummy changes, and push it. And when i create mr - i see conflict message.
Is there any suggestions where where and what i should to check?

Thanks! eldar.

1 Like