Git Commit Your Changes Or Stash Them Before You Merge
 Git Commit Your Changes Or Stash Them Before You Merge 
 Commit the changes
1
git commit -m "updating message"
Stash
1
git stash
then merge:
1
git stash pop
Discard the local changes
1
git reset --hard
or
1
git checkout -t -f remote/branch
For spacific file
1
git checkout filename
 This post is licensed under  CC BY 4.0  by the author.