関連ワード:  git apply patch resolve conflicts    git apply patch merge conflict    git apply patch and fix conflicts  
結果 : git apply patch resolve conflicts