How to update a git repository containing a submodule?

Question

After a while, I wanted to update the git repository, and then something went wrong. What is the correct way out of this situation?

mblsha@siruba:~/src/psi/ $ git status
iris: needs merge
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#   modified:   src/common.cpp
#
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#
#   unmerged:   iris
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#   gupdate.sh
mblsha@siruba:~/src/psi/ $ git submodule status
+cf237ef8f3d9dc058dbde47e6973e6388608ce60 iris (heads/master)
+cf237ef8f3d9dc058dbde47e6973e6388608ce60 iris (heads/master)
+cf237ef8f3d9dc058dbde47e6973e6388608ce60 iris (heads/master)
mblsha@siruba:~/src/psi/ $ cd iris 
mblsha@siruba:~/src/psi/iris/ $ cat .git/HEAD 
cf237ef8f3d9dc058dbde47e6973e6388608ce60

Answer 1

When it comes to git submodules, almost any problem you encounter can be solved with:

1. deleting the submodule (rm -r iris)
2. recreating it again (git submodule update)

Obviously, if you made local changes to your submodule, it is DELETING them CONSTANTLY, so if you have local changes, make sure you click them first.

Answer 2

question , stackoverflow, , , git reset HEAD iris .