feat: resolve conflicts

metagpt/utils/common.py

@@ -223,10 +223,15 @@ class CodeParser:
         # 遍历所有的block
         for block in blocks:
             # 如果block不为空，则继续处理
-            if block.strip() != "":
+            if block.strip() == "":
+                continue
+            if "\n" not in block:
+                block_title = block
+                block_content = ""
+            else:
                 # 将block的标题和内容分开，并分别去掉前后的空白字符
                 block_title, block_content = block.split("\n", 1)
-                block_dict[block_title.strip()] = block_content.strip()
+            block_dict[block_title.strip()] = block_content.strip()
 
         return block_dict
 

metagpt/utils/git_repository.py

@@ -233,6 +233,8 @@ class GitRepository:
         files = []
         try:
             directory_path = Path(self.workdir) / relative_path
+            if not directory_path.exists():
+                return []
             for file_path in directory_path.iterdir():
                 if file_path.is_file():
                     rpath = file_path.relative_to(root_relative_path)