19 Mar 2022 • on git

Git Commit Your Changes Or Stash Them Before You Merge

Commit the changes

git commit -m "updating message"

git stash

then merge:

git stash pop

git reset --hard

git checkout -t -f remote/branch

For spacific file

git checkout filename