関連ワード:  git ignore merge command    git command to ignore merge conflicts  
結果 : git ignore merge command