$ 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
原文：http://www.cnblogs.com/scaptain/p/4112959.html