84669 person learning
152542 person learning
20005 person learning
5487 person learning
7821 person learning
359900 person learning
3350 person learning
180660 person learning
48569 person learning
18603 person learning
40936 person learning
1549 person learning
1183 person learning
32909 person learning
今天提交代码，自动部署，结果提示merge失败，登上服务器看了下状态，有一个文件的状态显示的是UU
$ git status -s UU filename.php
从来没有见过这种状态，请问一下这个字母代表的是什么含义？
The merge is not completed yet because the conflict is not resolved
It is not recommended to solve it on the server. It is usually deployed after the local merge is tested
git merge --abortYou can cancel this unfinished merge
git merge --abort
![[Web front-end] Node.js quick start](https://img.php.cn/upload/course/000/000/067/662b5d34ba7c0227.png)
The merge is not completed yet because the conflict is not resolved
It is not recommended to solve it on the server. It is usually deployed after the local merge is tested
git merge --abortYou can cancel this unfinished merge