As I am trying to pull some changes from origin/master, I am getting this error :
error: Your local changes to the following files would be overwritten by merge
because I made local changes. I don't want to commit these changes, so I suppose I should use git stash on my branch, then git pull origin master
My question is :
- Will the pull simply ignore the changes and merge correctly
- Can I still use my local changes after the pull + the ones merged without any additional step ?
Thank you !
PS : yes, I googled, I just want to make sure I understood correctly.