$ git rm --cached iLedger.xcodeproj/project.xcworkspace/xcuserdata/Alex.xcuserdatad/UserInterfaceState.xcuserstate$ git commit -m "Removed the stupid strange file that shouldn‘t be tracked"

XCode merge error UserInterfaceState