Hi all,
I'm using Kohana and recently I wanted to change kohana modules into git submodules for easier updating.
To clarify, I will refer to modules as kohana modules (just folders) and submodules to actual git submodules.
I switched to master branch and deleted all the modules and replaced them with submodules from http://github.com/kohana.
When switching to develop branch (with no submodules) from master branch I had the exact issue described here http://www.ultrasaurus.com/sarahblog/2009/03/git-submodule-gotcha/
error: Untracked working tree file smth/smth
But I before I saw this article, when checking out develop I used -f flag to force the checkout, then merged.
Now, my develop branch has all the folders and .gitmodules file like the master branch but every submodule is empty (they only have their own .git folders inside).
When I run
git submodule update --init
on develop, it does nothing.
How can I "bring" submodules from master into develop ? Seems like at the moment i cannot work at all on branches other than master because half of my framework is missing :(
I hope my question is clear, because the situation is pretty complicated. Any help will be appreciated!
Btw. I'm using msysgit 1.6.5.1 on Win7 64bit.
Regards, yogal