[英]xcode replaces tabs by spaces after a branch merge
After a merge of two branches, and resolving conflicts, Xcode modifies two files: the .plist and the .pbxproj of the project. 在合并了两个分支并解决冲突之后,Xcode修改了两个文件:.plist和项目的.pbxproj。 In both cases, the leading tabs of every line are replaced by spaces .
在这两种情况下, 每行的前导选项卡都用空格替换 。
Also after finishing the merge and creating the corresponding commit, Xcode leaves all the files that had conflicts without adding them to the commit, forcing us to make a second commit with the resolved files (including .plist and .pbxproj). 此外,在完成合并并创建相应的提交后,Xcode会保留所有冲突的文件,而不会将它们添加到提交中,从而迫使我们使用已解析的文件(包括.plist和.pbxproj)进行第二次提交。 Only happens with those two files and only if they have conflicts on the merge, other file types (.h, .m) not affected.
只有这两个文件才会发生,并且只有当它们在合并上有冲突时,其他文件类型(.h,.m)才会受到影响。
Xcode Version 9.2 (9C40b) Xcode版本9.2(9C40b)
We would like to know how to avoid this behaviour? 我们想知道如何避免这种行为?
声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.