git status status shows UU

Question

I submitted the code today and deployed it automatically. The result was that the merge failed. I logged on to the server and checked the status. The status of one file showed UU

$ git status -s
UU filename.php

I have never seen this state before. What does this letter mean?

Answer 1

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