赞
踩
当我跑:
git status
我看到这个:
rebase in progress; onto 9c168a5
You are currently rebasing branch 'master' on '9c168a5'.
(all conflicts fixed: run "git rebase --continue")
nothing to commit, working directory clean
当我做:
ls `git rev-parse --git-dir` | grep rebase || echo no rebase
我看到:rebase-apply
我不能承诺起源。
git branch
显示:
* (no branch, rebasing master)
develop
master
我被卡住了。我不知道该怎么办?真的需要这么长时间才能修复吗? git rebase –continue不做任何事情。我没有任何的git状态..我只是等待rebase。我能做什么?
UDATE:
这是输出:git rebase –continue
Applying: no message
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
git add。没有什么
Copyright © 2003-2013 www.wpsshop.cn 版权所有,并保留所有权利。