Geek asks and answers

Git stash pop: avoid quotes and steps without experience

Sometimes at startup git stash popthere are merge conflicts that need to be resolved. This happens very often when I have to attach / pop up before / after switching branches.

Conflicts are not a problem to resolve, but it has two annoying side effects:

  • All changes coming from the wallet are now delivered and must be uninstalled

  • stash@{0} not discarded and must be deleted manually

Look for suggestions on how to make this process a little smoother.

+3
source share
2 answers

stash , stash, -m

git checkout -m master

. ,

git stash
git checkout master
git stash pop
git reset HEAD .
0

git stash drop - git stash clear, , . git reset --hard, stash git reset HEAD ., , .

. .

, .

-1

More articles:


All Articles