How do I resolve git saying "Commit your changes or stash them before you can merge"?