步骤1. team–>update 步骤2. team–>Show Tree Conflict–>标记"冲突已解决" 步骤3. team–>commit 转载于:https://www.cnblogs.com/tinoyoung/p/5993109.html