結果 : how to resolve merge conflicts in git using visual studio code