関連ワード:  git ignore merge changes    git merge ignore local changes    git merge ignore incoming changes    git merge ignore whitespace changes    git merge ignore all changes    git merge ignore remote changes    git merge ignore my changes    git merge ignore all incoming changes    git merge conflict ignore remote changes    git merge branch but ignore changes