选择文件，右键
选择Git Index 然后会弹出下面的页面
点击“Copy all non-conflicting changes from Right to Left”
另一种方法是通过右键”replace“ -> File in Git Index
选择文件，右键
选择Git Index 然后会弹出下面的页面
点击“Copy all non-conflicting changes from Right to Left”
另一种方法是通过右键”replace“ -> File in Git Index