So, I wanna do at least a little due diligence on Unihan. @duncdrum has forked TEI, and issued a PR of his "unihan-phase2" branch into the main TEI 'dev' branch. I'd like to create a (local) test copy of the TEI repo that has both the 31 new commits to TEI:dev since @duncdrum last merged, and the PR. I do *not* want this to signal accepting the PR into our branch. Seems to me there are two approaches, neither of which I know how to do off the top of my head: 1) from my local copy of duncdrum:TEI:unihan-phase2 somehow merge in TEIC:TEI:dev 2) from my local copy of TEIC:TEI:dev somehow merge in duncdrum:TEI:unihan-phase2 I don't care which I do, so long as there is no affect to the GitHub versions of this stuff. Any suggestions?