我在我的主人的底墊中的中間階段分支Git的底墊不會繼續後,刪除/修改衝突
git checkout stage
git rebase master
在一段時間我刪除了兩個文件,然後修改根據這兩個文件到GIT。
warning: too many files, skipping inexact rename detection
CONFLICT (delete/modify): test-recommendation-result.php deleted in HEAD and modified in [Bug] Fix test recommender. Version [Bug] Fix test recommender of test-recommendation-result.php left in tree.
CONFLICT (delete/modify): test-recommendation.php deleted in HEAD and modified in [Bug] Fix test recommender. Version [Bug] Fix test recommender of test-recommendation.php left in tree.
Failed to merge in the changes.
Patch failed at 0015.
我想說 「是混帳,繼續和刪除這些文件」,這樣....
git rm test-recommendation-result.php
git rm test-recommendation.php
git rebase --continue
混帳說:
Applying [Bug] Fix test recommender
No changes - did you forget to use 'git add', Stupid?
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".
我說:「別叫我「愚蠢」,只是做我告訴你要做的事!「
我們現在處於對峙狀態。誰是對的,我如何解決這個問題?
git也稱我太笨 – luckyging3r 2016-11-30 20:36:36