関連ワード:  git merge help    git stop merge process    git merge theirs example  
結果 : git merge help