関連ワード:  git merge ignore changes    git rebase ignore changes    git merge discard changes    git merge ignore local changes    git merge ignore incoming changes    git merge ignore whitespace changes    git rebase discard changes    git merge ignore all changes    git merge ignore remote changes    git merge ignore my changes