commit your changes or stash them before you can merge. pull anyways code example Example: git stash changes before merge git stash pop