error: Your local changes to the following files would be overwritten by checkout: index.html Please commit your changes or stash them before you switch branches. Aborting code example

Example: git stash changes before merge

git stash pop