一个奇怪的 git 问题 - V2EX
V2EX = way to explore
V2EX 是一个关于分享和探索的地方
现在注册
已注册用户请  登录
git
Pro Git
Atlassian Git Tutorial
Pro Git 简体中文翻译
GitX
kaminic
V2EX    git

一个奇怪的 git 问题

  •  
  •   kaminic 2017-08-08 18:07:27 +08:00 3181 次点击
    这是一个创建于 2993 天前的主题,其中的信息可能已经有所发展或是发生改变。
    android git:(feature-new-ui) git status -s
    android git:(feature-new-ui) git checkout develop
    Switched to branch 'develop'
    Your branch is ahead of 'origin/develop' by 1 commit.
    (use "git push" to publish your local commits)
    android git:(develop) git status -s
    android git:(develop) git checkout feature-new-ui
    Switched to branch 'feature-new-ui'
    Your branch is ahead of 'origin/feature-new-ui' by 2 commits.
    (use "git push" to publish your local commits)
    android git:(feature-new-ui) git status -s
    D ByteParser/build.gradle
    D ByteParser/src/main/java/com/nd/byteparser/ByteParser.java

    当前分支是 feature-new-ui 是干净的,
    从 feature-new-ui 切到 develop, develop 也是干净的,
    再从 develop 切到 feature-new-ui
    这时,多了两条文件发生变化的记录,
    这是什么原因???
    第 1 条附言    2017-08-08 20:55:10 +08:00
    在 feature-new-ui 分支里 reset hard 到 HEAD 解决了,下次再来回切分支又出现了
    5 条回复    2017-08-09 15:16:30 +08:00
    jesse_luo
        1
    jesse_luo  
       2017-08-08 23:29:32 +08:00
    大小写?
    majinjing3
        2
    majinjing3  
       2017-08-09 00:40:54 +08:00 via Android
    .gitignore 引起的吧,
    kaminic
        3
    kaminic  
    OP
       2017-08-09 09:49:48 +08:00
    @majinjing3 不是.gitignore
    TimRChen
        4
    TimRChen  
       2017-08-09 10:38:35 +08:00
    切到 feature-new-ui 分支时,有两个 commit,你应该 git stash 暂存,然后再切回
    kaminic
        5
    kaminic  
    OP
       2017-08-09 15:16:30 +08:00
    @TimRChen 暂存是对于不干净的工作区来说的,我的工作区已经是干净的了,两个 commit是说我本地有两个 commit 没有 push
    关于     帮助文档     自助推广系统     博客     API     FAQ     Solana     880 人在线   最高记录 6679       Select Language
    创意工作者们的社区
    World is powered by solitude
    VERSION: 3.9.8.5 24ms UTC 22:37 PVG 06:37 LAX 15:37 JFK 18:37
    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