Git stash pop error
git stash pop
, a possible error is: Your local changes to the following files would be overwritten by merge. $ git stash pop
error: Your local changes to the following files would be overwritten by merge:
src/store.js
Please commit your changes or stash them before you merge.
Aborting
The stash entry is kept in case you need it again.
Possibly you have uncommitted work in the file store.js, or there will be conflict in the file after git stash pop. A solution is:
git add src/store.js
git stash pop
Then modify the conflict in store.js, do
git add src/store.js
, git commit -m "xxx"
, problem solved. git stash
pop [--index] [-q|--quiet] [] Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of git stash push. The working directory must match the index.
Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call git stash drop manually afterwards.
If the --index option is used, then tries to reinstate not only the working tree’s changes, but also the index’s ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally).
When no is given, stash@{0} is assumed, otherwise must be a reference of the form stash@{}.
apply [--index] [-q|--quiet] [] Like pop, but do not remove the state from the stash list. Unlike pop, may be any commit that looks like a commit created by stash push or stash create.
이 내용에 흥미가 있습니까?
현재 기사가 여러분의 문제를 해결하지 못하는 경우 AI 엔진은 머신러닝 분석(스마트 모델이 방금 만들어져 부정확한 경우가 있을 수 있음)을 통해 가장 유사한 기사를 추천합니다:
다양한 언어의 JSONJSON은 Javascript 표기법을 사용하여 데이터 구조를 레이아웃하는 데이터 형식입니다. 그러나 Javascript가 코드에서 이러한 구조를 나타낼 수 있는 유일한 언어는 아닙니다. 저는 일반적으로 '객체'{}...
텍스트를 자유롭게 공유하거나 복사할 수 있습니다.하지만 이 문서의 URL은 참조 URL로 남겨 두십시오.
CC BY-SA 2.5, CC BY-SA 3.0 및 CC BY-SA 4.0에 따라 라이센스가 부여됩니다.