我最近做了一个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