子模块中的 Git 合并冲突。如何提交其版本？

Question

基本上我已经阅读了git合并冲突的指南，但我不确定它是否直接解决了我的问题。我在子模块中有一个冲突，我只想采用他们的版本，我知道用git diff -3 app/bundles可以实现。我该如何采用他们的子模块版本，解决冲突并提交？

~/projects/sms/admin(rc)$ git diff
diff --cc app/bundles
index 999fd0a,ae6acdc..0000000
--- a/app/bundles
+++ b/app/bundles
~/projects/sms/admin(rc)$ git diff -1 app/bundles
* Unmerged path app/bundles
diff --git a/app/bundles b/app/bundles
index b34a733..999fd0a 160000
--- a/app/bundles
+++ b/app/bundles
@@ -1 +1 @@
-Subproject commit b34a73375b4dfed6086d26d205ab5535acece053
+Subproject commit 999fd0a307e6d8d517ddf3dd6fab28a3ac0ec2c9
~/projects/sms/admin(rc)$ git diff -2 app/bundles
* Unmerged path app/bundles
~/projects/sms/admin(rc)$ git diff -3 app/bundles
* Unmerged path app/bundles
diff --git a/app/bundles b/app/bundles
index ae6acdc..999fd0a 160000
--- a/app/bundles
+++ b/app/bundles
@@ -1 +1 @@
-Subproject commit ae6acdce79748ffba68504512536abf2b2b2ddf0
+Subproject commit 999fd0a307e6d8d517ddf3dd6fab28a3ac0ec2c9

- JZ.

Answer 1

如果我理解正确，您想要清除子模块中所有的更改？ 如果是这样，请进入子模块，重置并将更改提交到外部存储库。

cd app/bundles

请再次验证哈希值。 所有更改都将丢失。

git reset --hard ae6acdce79748ffba68504512536abf2b2b2ddf0

cd ../..

git add app/bundles

git commit

希望这是您想要实现的。

- iltempo