I did pretty much the same thing. Original post here: Best practice for combining two repos into new Trellis+Bedrock Repo