做一次伸手党, 分支问题 - V2EX
git
Pro Git
Atlassian Git Tutorial
Pro Git 简体中文翻译
GitX
lixia625
V2EX    git

做一次伸手党, 分支问题

  •  
  •   lixia625 Jul 22, 2015 3553 views
    This topic created in 3948 days ago, the information mentioned may be changed or developed.

    情景:
    处于A分支,up-to-date状态
    开发。。。。
    情况不对,越走越偏了,需要把当前进度保存到一个新创建的新分支B里,A回到一开始up-to-date状态

    请问正确的操作是?

    8 replies    2015-07-22 17:13:30 +08:00
    peizh2006
        1
    peizh2006  
       Jul 22, 2015   1
    git checkout -b newbranch //新建并切换到newbranch
    git add .
    git commit -m "temp commit" //提交走偏的内容
    git checkout A //回到A分支
    jdlau
        2
    jdlau  
       Jul 22, 2015   1
    你有commit过吗?
    lixia625
        3
    lixia625  
    OP
       Jul 22, 2015
    @jdlau 对啊我还没commit怕个毛
    一语道破 是我蠢了
    KentY
        4
    KentY  
       Jul 22, 2015
    如果是git, 不要吝惜使用branch,尽量不要写3天commit一次, 要用branch!
    Tiande
        5
    Tiande  
    PRO
       Jul 22, 2015
    @KentY _(:3」∠)_ 我一天至少 commit 三次。完了、
    randyzhao
        6
    randyzhao  
       Jul 22, 2015
    我都是用 stash
    chaixl
        7
    chaixl  
       Jul 22, 2015
    你这个情况应该stash
    kyze8439690
        8
    kyze8439690  
       Jul 22, 2015
    看情况,如果你修改的文件已经在index中,不commit不让你换分支吧,如果是新文件,那直接checkout,新文件会跟过去。
    About     Help     Advertise     Blog     API     FAQ     Solana     5067 Online   Highst 6679       Select Language
    创意工作者们的社区
    World is powered by solitude
    VERSION: 3.9.8.5 57ms UTC 01:07 PVG 09:07 LAX 18:07 JFK 21:07
    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