标签：merge

crifan 9年前 (2016-03-01) 3944浏览 0评论

结果失败了： The working copy "iOS-Client" failed to merge. error: Your local changes to the following files would ...

crifan 9年前 (2016-03-01) 6338浏览 0评论

试试： 以及： Merge Into Branch ［已解决］Xcode中merge失败：error Your local changes to the following files would be overwritten by merg...