title: Git Merge conflicts in submodule. How to commit with their version?
body: <p>Basically I have read the git merge conflicts guide, and I'm not sure it directly addresses my situation. I have a conflict in submodules, and I just want to go with their version which I understand is <code>git diff -3 app/bundles</code> How do I just go with there version of the submodule, resolve the conflict and commit?</p>
  
  <pre><code>~/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
  </code></pre>