I am attempting to use pull to bring in changes from my master branch into my feature branch. Both branchs have the same submodule. The submodule pointer has been updated in my master branch only. No additional submodules have been added.

If there are no conflicts in the files being pulled into my feature branch when I perform the pull from master onto my feature branch the submodule pointer change is staged and the pull process is working as expected.

See Image:

"Submodule Only Change"

If there are conflicts in any of the files when I perform the pull from master onto my feature branch the submodule pointer change appears in both the staged and unstaged boxes. The submodule pointer reference is not in conflict here it should appear as a staged change only. If I highlight the change to see the differences no information is displayed so I am not sure which submodule pointer is staged to be committed. In addition if I commit the submodule the unstaged one stays and I have to discard it.

See Images:

"Files After Pull with conflicts"
"After Commiting Merged Conflicted Files"
"After Commiting Merged Conflicted Files"

Additionally if a merge issue does arise with a submodule pointer then it automatically stages the pulled in change and does not inform the user that the file was in conflict.