How can I easily incorporate the support code improvements in my glossary without overwriting my definitions or readme?

[gregelin]

So I am doing https://github.com/gitmachines/glossary. I want to include the programmatic elements in unitedstates/glossary. But I do not want to overwrite my definitions. Is there a way to do that easily with Git, or how we design the components?

[konklone]

Actually, this should be fairly easy - the programmatic elements are all in the dat branch. It's all WIP, of course, but it is designed to be entirely separate from the master and gh-pages branches, and to sync master->gh-pages. It has a config.js file that can be configured with any repository that you control.

I think if you create an orphan dat branch on your side, you could make a PR between your dat branch and mine and keep them in sync going forward.

[konklone]

Hey @benbalter, is there an easy way to submit a PR that would create a new branch on someone else's repo? I've got this whole branch I want someone to have.

[benbalter]

Easy enough for the target repository owner to do it via command line without the pull request, or the target repo can just initially create the branch via either command line or pull request, and on the compare screen, you can select the target branch.

[gregelin]

I read the words that Ben is writing and I wonder if they make sense to me.
I will try.

On Thu, Oct 10, 2013 at 11:32 AM, Ben Balter [email protected]:

Easy enough for the target repository owner to do it via command line
without the pull request, or the target repo can just initially create the
branch via either command line or pull request, and on the compare screen,
you can select the target branch.

—
Reply to this email directly or view it on GitHubhttps://github.com//issues/22#issuecomment-26063986
.

[konklone]

Greg, try this, in your repo's main dir:

git checkout --orphan dat
git rm -r .
git push -u origin dat

That should make you a blank slate dat branch, and a PR from me will probably bring them in sync?

[gregelin]

No luck.

Greg-Elins-MacBook-Air:glossary greg$ git push -u origin dat
error: src refspec dat does not match any.
error: failed to push some refs to '[email protected]:GitMachines/glossary.git'

Here is my git config -l

user.name=Greg Elin
[email protected]
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true
core.ignorecase=true
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
[email protected]:GitMachines/glossary.git
branch.master.remote=origin
branch.master.merge=refs/heads/master

[konklone]

Questions - What was the output of the other commands? Did you create the orphaned dat branch first? If you run git branch, what does it say?

(Maybe let's take this to email.)