responding to error message during attempted pull_commit your changes or stash them before you can merge
fixing merge issues