如何解决当前场景中的树冲突。
C:\DevBranch
C:\MyBranch
我更新了两个分支。编辑 MyBranch 然后提交回来。现在想将这些更改合并到 DevBranch。当我进行合并时,我得到“树冲突”
The last merge operation tried to add the file 'abc.def', but it was already added locally.
How do you want to resolve this conflict?
Keep the file from repository
Keep the local file
我该如何解决?