error: Your local changes to the following files would be overwritten by merge: public/js/app.js Please, commit your changes or stash them before you can merge. code example

Example 1: github error “Commit your changes or stash them before you can merge”?

//If you don't care about your local changes, 
//you can switch to other branch temporary (with force), 
//and switch it back, e.g. :
git checkout master -f

Example 2: git stash changes before merge

git stash pop