git stash them before you merge. code example

Example: git stash changes before merge

git stash pop