iOS git merge时的project.pbxproj冲突怎么解决?加了.gitattributes还是冲突? - V2EX
Home Sign Up Sign In
V2EX = way to explore
V2EX 是一个关于分享和探索的地方
Sign Up Now
For Existing Member  Sign In
ro00

iOS git merge时的project.pbxproj冲突怎么解决?加了.gitattributes还是冲突?

  •   
  •   ro00 Jul 10, 2013 9748 views
    This topic created in 4674 days ago, the information mentioned may be changed or developed.
    有没什么办法能把两个当成文本来merge的?
  • merge
  • 冲突
  • project
    6 replies    2014-08-01 22:06:02 +08:00
    alexrezit
        1
    alexrezit  
       Jul 10, 2013
    它本来就是文本...
    vietor
        2
    vietor  
       Jul 10, 2013
    难道是UTF-16编码？或者两个文件的编码不一样？如果git识别成二进制文件就需要转码成可以识别的编码，比如UTF-8
    ro00
        3
    ro00  
    OP
       Jul 10, 2013 via iPhone
    @alexrezit xcode。merge时老是冲突，怎么办？
    alexrezit
        4
    alexrezit  
       Jul 10, 2013
    @ro00
    手动咯! 如果你的合作伙伴傻到改了几十个文件才 commit 那就惨咯哇...
    lldong
        5
    lldong  
       Jul 10, 2013   1
    把project.pbxproj排序后再提交可以避免merge冲突，排序脚本在此：https://raw.github.com/WebKit/webkit/master/Tools/Scripts/sort-Xcode-project-file
    seganw
        6
    seganw  
       Aug 1, 2014
    推荐我刚开发的脚本： https://github.com/truebit/xUnique。具体用法见里面的README
    About     Help     Advertise     Blog     API     FAQ     Solana     1023 Online   Highest 6679       Select Language
    创意工作者们的社区
    World is powered by solitude
    VERSION: 3.9.8.5 52ms UTC 19:02 PVG 03:02 LAX 12:02 JFK 15:02
    Do have faith in what you're doing.
    ubao msn snddm index pchome yahoo rakuten mypaper meadowduck bidyahoo youbao zxmzxm asda bnvcg cvbfg dfscv mmhjk xxddc yybgb zznbn ccubao uaitu acv GXCV ET GDG YH FG BCVB FJFH CBRE CBC GDG ET54 WRWR RWER WREW WRWER RWER SDG EW SF DSFSF fbbs ubao fhd dfg ewr dg df ewwr ewwr et ruyut utut dfg fgd gdfgt etg dfgt dfgd ert4 gd fgg wr 235 wer3 we vsdf sdf gdf ert xcv sdf rwer hfd dfg cvb rwf afb dfh jgh bmn lgh rty gfds cxv xcv xcs vdas fdf fgd cv sdf tert sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf sdf shasha9178 shasha9178 shasha9178 shasha9178 shasha9178 liflif2 liflif2 liflif2 liflif2 liflif2 liblib3 liblib3 liblib3 liblib3 liblib3 zhazha444 zhazha444 zhazha444 zhazha444 zhazha444 dende5 dende denden denden2 denden21 fenfen9 fenf619 fen619 fenfe9 fe619 sdf sdf sdf sdf sdf zhazh90 zhazh0 zhaa50 zha90 zh590 zho zhoz zhozh zhozho zhozho2 lislis lls95 lili95 lils5 liss9 sdf0ty987 sdft876 sdft9876 sdf09876 sd0t9876 sdf0ty98 sdf0976 sdf0ty986 sdf0ty96 sdf0t76 sdf0876 df0ty98 sf0t876 sd0ty76 sdy76 sdf76 sdf0t76 sdf0ty9 sdf0ty98 sdf0ty987 sdf0ty98 sdf6676 sdf876 sd876 sd876 sdf6 sdf6 sdf9876 sdf0t sdf06 sdf0ty9776 sdf0ty9776 sdf0ty76 sdf8876 sdf0t sd6 sdf06 s688876 sd688 sdf86