GIT我該怎麼做 - 所有衝突修復：運行「git rebase -continue」

當我運行git status時，看到以下消息似乎在勸我運行git rebase --continue。GIT我該怎麼做 - 所有衝突修復：運行「git rebase -continue」

昨天我有一個合併衝突，解決了它，合併了它&把它推到了我們的分期網站。

UPDATE 我跑了git rebase --skip並且引起了更多的問題！

$ (716-RWD) git status 
On branch 716-RWD 
Your branch is up-to-date with 'origin/716-RWD'. 
You are currently rebasing branch '716-RWD' on '7e68797'. 
    (all conflicts fixed: run "git rebase --continue") 

nothing to commit, working directory clean 
holy in ~/ubuntu_1404/httpdocs/magento 
$ (716-RWD) git rebase --skip 
Applying: themed product listings fro mobile 
Using index info to reconstruct a base tree... 
A skin/frontend/bootstrapped/default/css/rwd.css 
M skin/frontend/bootstrapped/default/js/boutique.js 
A skin/frontend/bootstrapped/default/sass/_catalog-categories.scss 
Falling back to patching base and 3-way merge... 
CONFLICT (modify/delete): skin/frontend/bootstrapped/default/sass/_catalog-categories.scss deleted in a2de9914584b4eae3b335700e9ef6486c858ab43 and modified in themed product listings fro mobile. Version themed product listings fro mobile of skin/frontend/bootstrapped/default/sass/_catalog-categories.scss left in tree. 
CONFLICT (modify/delete): skin/frontend/bootstrapped/default/css/rwd.css deleted in a2de9914584b4eae3b335700e9ef6486c858ab43 and modified in themed product listings fro mobile. Version themed product listings fro mobile of skin/frontend/bootstrapped/default/css/rwd.css left in tree. 
Failed to merge in the changes. 
Patch failed at 0006 themed product listings fro mobile 
The copy of the patch that failed is found in: 
    /Users/holy/ubuntu_1404/httpdocs/magento/.git/rebase-apply/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". 

holy in ~/ubuntu_1404/httpdocs/magento 
$ (716-RWD) git status 
On branch 716-RWD 
Your branch is up-to-date with 'origin/716-RWD'. 
You are currently rebasing branch '716-RWD' on '7e68797'. 
    (fix conflicts and then run "git rebase --continue") 
    (use "git rebase --skip" to skip this patch) 
    (use "git rebase --abort" to check out the original branch) 

Changes to be committed: 
    (use "git reset HEAD <file>..." to unstage) 

    modified: app/design/frontend/bootstrapped/default/template/catalog/navigation/left.custom.phtml 
    new file: media/catalog/category/Booster.png 

Unmerged paths: 
    (use "git reset HEAD <file>..." to unstage) 
    (use "git add/rm <file>..." as appropriate to mark resolution) 

    deleted by us: skin/frontend/bootstrapped/default/css/rwd.css 
    deleted by us: skin/frontend/bootstrapped/default/sass/_catalog-categories.scss

來源

2016-03-25 Holly

你也可以做git的變基--abort – Martin

@馬丁，我沒'git的變基--skip'，它似乎讓更多的變化，不知道做什麼，現在呢？我用更多的細節更新了我的問題 – Holly

@Holy你需要做的第一件事是閱讀重新印刷的內容，然後練習一下測試庫。你正處於未完成的重建階段。如果你放棄了，它可能會撤銷你提交的任何提交，但幸運的是，'git reflog'保留所有提交，所以你不會失去任何東西。 – sashoalm

最後我跑git rebase --abort然後git pull。 Everthing恢復正常，我在那個分支上所做的所有更改似乎都在那裏。

$ (716-RWD) git rebase --abort 
ross in ~/ubuntu_1404/httpdocs/magento 
$ (716-RWD) git status 
On branch 716-RWD 
Your branch is behind 'origin/716-RWD' by 7 commits, and can be fast-forwarded. 
    (use "git pull" to update your local branch) 
nothing to commit, working directory clean 
ross in ~/ubuntu_1404/httpdocs/magento 
$ (716-RWD) git pull

來源

2016-03-25 10:01:53 Holly

GIT我該怎麼做 - 所有衝突修復：運行「git rebase -continue」

回答

相關問題