When I try to merge it fails, see screen image for error :
I have a .gitignore see below :
# Xcode
.DS_Store
*/build/
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
profile
*.moved-aside
DerivedData
.idea/
*.hmap
My gitignore was called default.gitignore then I changed it to .gitignore, neither changed the outcome.
Any suggestions much appreciated.
Many thanks,
Guy