［已解决］Xcode中merge失败：error Your local changes to the following files would be overwritten by merge UserInterfaceState.xcuserstate
crifan 8年前 (2016-03-01) 3068浏览 0评论
结果失败了： The working copy "iOS-Client" failed to merge. error: Your local changes to the following files would ...