Please commit your changes or stash them before you 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 -fgit stash
git stash pop