3
由于冲突而无法“ git stash pop”
我有一个本地git存储库,并且有几个修改过的文件。然后我需要快速修复某些问题,所以我 隐藏了我的更改(git隐藏) 编辑文件(vi文件) 已提交(git commit) 弹出藏匿(git stash pop) 这导致了冲突。 # On branch master $ git stash pop Auto-merging page/search.php CONFLICT (content): Merge conflict in page/search.php $ git status # On branch master # Unmerged paths: # (use "git reset HEAD <file>..." to unstage) # (use "git add/rm <file>..." as appropriate …
19
linux
command-line
unix
git