関連ワード:  git merge discard changes    git merge ignore changes    git merge undo changes    git merge discard local changes    git remove merge changes    git revert merge changes    git cancel merge changes    git merge discard remote changes    git merge ignore local changes    git merge ignore incoming changes