TomVista
V2EX  ›  问与答

有点急,,, 合并无关分只

  •  
  •   TomVista · Sep 27, 2019 · 1238 views
    This topic created in 2425 days ago, the information mentioned may be changed or developed.

    uuTxkF.png

    把 master 和 develop 指向到 new-cli 并且保留 master 和 develop 的记录,所有的文件以 new-cli 为主,,master 和 develop 的不要也行 无能为力,找不到解决办法

    SoloCompany
        1
    SoloCompany  
       Sep 27, 2019
    git checkout master
    git merge new-cli -Xtheirs
    git checkout new-cli — .
    git commit -m ‘merge new-cli'
    MuscleOf2016
        2
    MuscleOf2016  
       Sep 27, 2019
    看出来挺急的,标题都一堆错
    About   ·   Help   ·   Advertise   ·   Blog   ·   API   ·   FAQ   ·   Solana   ·   992 Online   Highest 6679   ·     Select Language
    创意工作者们的社区
    World is powered by solitude
    VERSION: 3.9.8.5 · 40ms · UTC 19:04 · PVG 03:04 · LAX 12:04 · JFK 15:04
    ♥ Do have faith in what you're doing.