我最近做了一個git stash
,然後做在樹枝上的一些工作,並試圖做一個git stash apply
時提交它,並得到了這些錯誤:如何解決「刪除/修改」引發的衝突「混帳藏匿應用」
CONFLICT (delete/modify): app/controllers/orders_controller.rb deleted in Updated upstream and modified in Stashed changes. Version Stashed changes of app/controllers/orders_controller.rb left in tree.
CONFLICT (content): Merge conflict in app/models/product.rb
git status
顯示以下內容:
$ git status
# On branch develop
# Your branch is ahead of 'origin/develop' by 16 commits.
# Unmerged paths:
# (use "git reset HEAD <file>..." to unstage)
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# deleted by us: app/controllers/orders_controller.rb
# both modified: app/models/product.rb
文件標記爲「刪除/修改」是,我添加和stash
之前還沒有提交新的文件。
我想回到我在git stash
之前的狀態 - 沒有提交本地更改。你能建議如何做到這一點?
謝謝。
謝謝。我只是意識到我做了'藏'適用於錯誤的分支。有沒有辦法在這個分支上取消「隱藏應用」? – stupakov 2012-04-07 17:19:06
在「隱藏應用」之前清理了錯誤的分支嗎?而且,'是否應用'或'堆疊流行'? – GoZoner 2012-04-07 17:36:52
它很乾淨,我沒有'申請' – stupakov 2012-04-07 18:04:30