git stash and git pull
Share
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
When you have changes on your working copy, from command line do:
This will stash your changes and clear your status report
This will pull changes from upstream branch. Make sure it says fast-forward in the report. If it doesn’t, you are probably doing an unintended merge
This will apply stashed changes back to working copy and remove the changes from stash unless you have conflicts. In the case of conflict, they will stay in stash so you can start over if needed.
if you need to see what is in your stash