delete commit your changes before merging. code example Example: git stash changes before merge git stash pop