合并分支后,我收到了一堆文件的conflict (rename/rename),并创建了file~HEAD和file~my_test_branch。如何解决这些问题?
conflict (rename/rename)
file~HEAD
file~my_test_branch
谢谢
https://stackoverflow.com/questions/14732639
相似问题