Committing is not possible because you have unmerged files

Method 1

Command: git add – U

come from

https://www.cnblogs.com/changyiqiang/p/12867839.html

(sorry for the trouble)

Read More: