Home/ Questions/Q 78145
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-10T20:56:28+00:00

After some time I wanted to update my git repo, and then something went

  • 0

After some time I wanted to update my git repo, and then something went wrong. What is the proper 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
Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

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

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

    Obviously if you have made local changes to your submodule this will DELETE them PERMANENTLY, so if you have local changes make sure you have pushed them first.

    • 0