Wraping my head around git subtree merging