步骤1. team–>update 步骤2. team–>Show Tree Conflict–>标记"冲突已解决" 步骤3. team–>commit 相关文章： 2021-07-15 2022-12-23 2022-12-23 2022-12-23 2022-02-01 2022-12-23 2021-04-01