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

What I did was to run:

git rm -rf --cached myuntrackedfolder

This tells git to forget about it (since it was being tracked formally).

Then I used:

git add myuntrackedfolder 

to add it and I was good to go.