解決子模塊的合並沖突

問題

• 試圖合並
  git checkout develop
git pull
git checkout feature/branchname
git merge develop
• GitHub顯示沖突
  This branch has conflicts that must be resolved
  to resolve conflicts before continuing.
  Conflicting files
  submodules/xxx
• 命令行顯示沖突

Failed to merge submodule submodules/apis (commits don't follow merge-base)
Auto-merging submodules/apis
CONFLICT (submodule): Merge conflict in submodules/apis

• 沖突文件
  vscode顯示為submodule 下 xxx.diff 文件，其內容為：

diff --cc submodules/apis
index a7b3a24f12,34fc93069c..0000000000
--- a/submodules/apis
+++ b/submodules/apis

使用git diff --submodule=diff 在命令行中輸出的也是同樣內容。

解決

git add submodulename
git commit

參考

https://stackoverflow.com/a/57732716