RaspberryPiFoundation / lesson_format

Lesson formatter
17 stars 28 forks source link

Update pandoc_scratchblocks (with translation fix) #181

Closed andylolz closed 8 years ago

martinpeck commented 8 years ago

Thanks!

Let's see if @CodeClubRik manages to revert this ;)

martinpeck commented 8 years ago

@CodeClubRik : A perfectly timed blog post from GitHub https://github.com/blog/2104-working-with-submodules

andylolz commented 8 years ago

Haha, nice :)

rikcross commented 8 years ago

Let's see if @CodeClubRik manages to revert this ;)

I'd say it's more than likely! I HATE submodules.

andylolz commented 8 years ago

@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! :)

martinpeck commented 8 years ago

For me, the warning signs come when...

  1. My clone says I don't have any changes locally (either via git status or through my command line prompt)
  2. I git pull without needing to merge
  3. It now appears that I have local changes

That should never happen, and it almost always cos of a submodule.

andylolz commented 8 years ago

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.