我面對,我不知道如何解決問題的衝突已經得到解決。Git的變基--continue抱怨,即使所有合併
我做對主衍合從我的分支:
git rebase master
,並得到了以下錯誤
First, rewinding head to replay your work on top of it...
Applying: checkstyled.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging AssetsLoader.java
CONFLICT (content): Merge conflict in AssetsLoader.java
Failed to merge in the changes.
Patch failed at 0001 checkstyled.
所以我去我喜歡的編輯器,固定在1號線衝突,保存的文件並做了一個git狀態,並得到了以下輸出:
# Not currently on any branch.
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: PassengerContactHandler.java
#
# Unmerged paths:
# (use "git reset HEAD <file>..." to unstage)
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified: AssetsLoader.java
#
我做了一個git添加AssetsLoader的.java和一個git的地位,得到了以下幾點:
# Not currently on any branch.
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: AssetsLoader.java
# modified: PassengerContactHandler.java
#
,當我做了GIT中變基--continue我得到:
git rebase --continue
You must edit all merge conflicts and then
mark them as resolved using git add
我知道我可以跳過補丁,並繼續重訂,但我不知道如果PassengerContactHandler.java更改將重建基礎到我的分支或沒有。
所以我不知道,我應該如何進行?
編輯:難道是與解決衝突的文件是完全一樣的原始版本?
非常感謝, 盧卡斯
編輯,它只是發生在我身上再次:
它只是發生在我身上再次,
(307ac0d...)|REBASE)$ git status
# Not currently on any branch.
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: assets/world/level1/Level-1.xml
# modified: George.java
# modified: DefaultPassenger.java
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# mb-art/originalAssets/27dec/
((307ac0d ...)| REBASE )$ git rebase --continue
You must edit all merge conflicts and then
mark them as resolved using git add
git --version
git version 1.7.1
這就是`git status`的完整輸出,對吧?它下面沒有缺失部分? – Cascabel 2011-12-15 18:28:33
是的,我粘貼了一切...... – Lucas 2011-12-21 15:59:30
`git-rebase`不應該報告有沒有未解決的衝突,如果沒有任何。如果你可以設法在一個簡單的測試案例中重現問題,那麼調試會更容易,但是,如果`git status`在`git rebase --continue`時報告沒有衝突,你的版本Git是最新的,您可以嘗試通過[email protected]向Git dev郵件列表發送電子郵件,並提供儘可能多的診斷信息。 – Cascabel 2011-12-21 22:55:04