这是我收到的消息
CONFLICT (modify/delete):
labs/lab14_observer_gui/new_code/web_code/web/my_web_server_command.cc deleted in HEAD and
modified in f42855bbf7dab5122732e1af3e48808d86bd9f71. Version
f42855bbf7dab5122732e1af3e48808d86bd9f71 of
labs/lab14_observer_gui/new_code/web_code/web/my_web_server_command.cc left in tree.
Automatic merge failed; fix conflicts and then commit the result.
过去，我能够通过进入文件并进行必要的更改来解决冲突，但是当我转到此处的文件时，看不到HEAD与更改之间的区别。