How to fix “modified content, untracked content” in git?

Question

The objective is to commit a git branch. The output of \"git status\" for the branch is:

On branch zeromq_new
Your branch is up to date with         


        

Answer 1

For some reason these separate repos have altered files. There are a couple ways to deal with it, depending what they actually are.

You can navigate into each repo and see what files are changed. Then you can commit, make a new branch, or get rid of the changes.

If these repos are seperate projects that you want to track but not mess with, you can make your parent repo simply ignore changes in these submodules with:

git update-index --assume-unchanged $DIRECTORY

(where $DIRECTORY is the submodule you want to ignore changes to)