Re: [Tei-council] git merging into fork

Hi Syd, you probably got advice already but for the record here’s my 2cent: I prefer option 2) – GitHub has good advice for doing so: when you look at the pull request, next to the green button you’ll find „command line instructions“. You’ll need an extra step after step 1 which pulls in the current changes from our dev branch. From the new branch, issue `git merge --no-ff dev`, that should do it. Best Peter

Am 27.01.2020 um 17:52 schrieb Syd Bauman :

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? _______________________________________________ Tei-council mailing list Tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council