Closed andylolz closed 8 years ago
@CodeClubRik : A perfectly timed blog post from GitHub https://github.com/blog/2104-working-with-submodules
Haha, nice :)
Let's see if @CodeClubRik manages to revert this ;)
I'd say it's more than likely! I HATE submodules.
@CodeClubRik: Here’s the most useful bit, I reckon:
- Remember that collaborators won't automatically see updates to submodules—if you update a submodule, you may need to remind your colleagues to run
git submodule update
or they will likely see odd behavior.
The submodule has been updated, so you should pull the latest version of lesson_format, then run that command! :)
For me, the warning signs come when...
git status
or through my command line prompt)git pull
without needing to mergeThat should never happen, and it almost always cos of a submodule.
That should never happen
If git pull
fetched recursively, I think this would be true. But it doesn’t (not by default, anyway). You can possibly do:
git pull --recurse-submodules
…and I guess that would elicit the behaviour you’re looking for.
Thanks!
Let's see if @CodeClubRik manages to revert this ;)