当我尝试在终端中拉入我的项目目录时,我看到以下错误:
harsukh@harsukh-desktop:~/Sites/branch1$ git pull origin master
U app/config/app.php
U app/config/database.php
U app/routes.php
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.
为什么git说"Pull is not possible because you have unmerged files",我该如何解决？
当我输入时,git status我看到:
T /path/to/file...
M /path/to/otherfile...
究竟是什么T git status意思？
我试过man git-status(我认为应该在那里,但不是).