Firebase scratch merge

[pmalacho-mit]

Hey @taz177 -- looks like there's lots of changes / conflicts with dev.

Something that could make your life easier, given that (1) you know you've only made changes to extensions/src/scratch3_jibo/ and (2) you know you'll no longer need git history from the past, is to create a new branch off of dev where you solely grab the scratch3_jibo folder.

From the command line, this could look like:

git checkout dev
git pull
git checkout -b jibo-firebase-changes-only
git checkout firebase-scratch-merge -- extensions/src/scratch3_jibo/

That last command will effectively tell git "go and get me these files from this other branch".

Let me know if that strategy sounds interesting!