bitbucket - Git - file flags conflict -

bitbucket - Git - file flags conflict -

i'm using bitbucket , end conflict, code same, when seek merge

i'm getting "file flags conflict", i've tried google didn't find much info particular issue, maybe can give me clue need for?

i've compare permissions , it's same on both files.

thank you.

update:

i did next:

pushed local changes remote repository. went okay. created pull-request main repository. when owner tried take pull-request "file flags conflict" appeared.

that seems bitbucket server issue, when merging fork (like accepting pull request). see instance bug report.

i merge local. have tried?

add remote: git remote add together kfsone https://bitbucket.org/kfsone/tradedangerous.git and can just: git pull kfsone master

merging locally trick.

so if conflict shown bitbucket on server side, seek cloning , merging locally first, force remote repo.

git bitbucket merge-conflict-resolution