This topic created in 4687 days ago, the information mentioned may be changed or developed.
有没什么办法能把两个当成文本来merge的?
 |
1
alexrezit Jul 10, 2013
它本来就是文本...
|
 |
2
vietor Jul 10, 2013
难道是UTF-16编码？或者两个文件的编码不一样？如果git识别成二进制文件就需要转码成可以识别的编码，比如UTF-8
|
 |
5
lldong Jul 10, 2013  1
把project.pbxproj排序后再提交可以避免merge冲突，排序脚本在此：https://raw.github.com/WebKit/webkit/master/Tools/Scripts/sort-Xcode-project-file
|
 |
6
seganw Aug 1, 2014
|
Select Language