[Notion-devel] Merging submodules with git

[Dima K. <no...@di...>]

Hi.

Recently, when the submodules got merged into the main tree, their
history was squashed. I made a tree that merges in all of the submodule
code, so the histories are all preserved.

Since we already have commits that add the code in squashed form, this
new tree doesn't replace those old commits, but augments them (which
does not confuse git). So the code in my tree is exactly the same as the
code in the current origin/master:

 b2f3b6759d7f6d7e3e6dc12f7291d2bb0457a914.

I think we should merge this tree into the main branch. This tree is at

 https://github.com/dkogan/notion/tree/merged_submodules

dima