#### 1、提交代码提示 `文件已经过时`:服务端文件版本已更新 --- **a. 点击`确定`** ![](https://img.itqaq.com/art/content/272b11e3f664f5431118527b9f2460f5.png) **b. 点击`更新`** ![](https://img.itqaq.com/art/content/95206189ea7cdfe1f31bdecfea397edf.png) **c. 点击`确定`** ![](https://img.itqaq.com/art/content/52250eaf0b6026ff1775ad9f613e4e8d.png) **d. 点击`取消`** ![](https://img.itqaq.com/art/content/f50b0cb844414420d207aa524cbbc728.png) #### 2、因为文件冲突生成的文件 + demo.txt.mine --> 自己写的 + demo.txt.r5 --> 公共部分 + demo.txt.r6 --> 服务端的 ![](https://img.itqaq.com/art/content/c62f22d1074e0cd14be425e2b1348746.png) **a. 手动解决冲突** 123 456 789 789 第二次提交 用户1 提交01 用户02写的内容 用户 01你说什么啊 <<<<<<< .mine *********************** ||||||| .r5 ======= 用户02 000331312 1111111111111111111111111>>>>>>> .r6 **b. 删除 `demo.txt.mine` `demo.txt.r5` `demo.txt.r6` 后重新提交** ![](https://img.itqaq.com/art/content/7aec80369fc0820e33fd7025d49411ad.png) **c. 点击确定** ![](https://img.itqaq.com/art/content/1ae594feeeb88fc180b32d9215b00950.png) **d. 提交成功** ![](https://img.itqaq.com/art/content/99d3c782e0a05d1b250e8a72af46ba31.png)