Git - file flags conflict
I am using bitbucket and I get a conflict, the code is exactly the same, but when I try to combine
I am getting file-to-file conflict, I tried to google it but didn’t find much information about this specific issue, maybe someone can give me some idea of what I need to look for?
I am comparing the permissions and they are the same for both files.
Thank.
UPDATE:
I did the following:
- Local changes made to the remote repository. Everything went well.
- A pull request has been created to the main repository.
- When the owner tried to accept file conflicts "request file".
+3
source to share
1 answer
This is similar to an issue with the BitBucket server when merging with a fork (for example accepting a pull request). See for example this bug report .
I always combine local ones. You tried?
- add remote control:
git remote add kfsone https://bitbucket.org/kfsone/tradedangerous.git
- and you can simply:
git pull kfsone master
Merging locally does the trick.
So, if this is a conflict shown by BitBucket on the server side, try cloning and merging locally first, then push back to the remote repo.
+4
source to share