First and foremost, I recommend you read this guide: http://github.com/guides/fork-a-project-and-submit-your-modifications
To get changes from "company" to "developer" you need to clone the dev's repo, add a remote to the company repo, pull from the company repo and push to the dev's repo. In the guide your "company" repo is refered to as "upstream". You may not want your developers pushing to the upstream repo at all, instead you might prefer that only you pull those changes in when doing a production deployment or making a release version tag (depending on what exactly is in your repo, of course). Lastly, HEAD points to the currently checked out branch. It's usually something you don't need to worry about much. The only time I really use it is when I call `git reset --hard HEAD` to clean out any uncommitted changes in my current branch. origin/HEAD probably doesn't concern you much at all, though if it's a repo on github it generally won't have a HEAD at all... --tek On Mon, Sep 1, 2008 at 2:58 PM, Laran Evans <[EMAIL PROTECTED]> wrote: > > I have two GitHub accounts. One let's call "company" the other let's > call "developer". The "company" account is a paid account with private > repositories. The "developer" account is a free account. > > The "company" account has a repo called "repo_c". I've had "developer" > fork "repo_c" after adding "developer" as a collaborator on "company/ > repo_c". I think this was the right way to go. > > My thinking for this approach was that each developer would develop > locally on their machine, then stage their work on GitHub when they've > worked out all the bugs and are ready to push their code into the > production codebase. > > I've since had to make some changes in "company/repo_c". I can't > figure out how to get those changes into "developer/repo_c" though. > > On the developer machine when I do "git branch -a" I get: > > $ git branch -a > * master > origin/HEAD > origin/master > > What is HEAD? It it a tracking branch for "company/repo_c"? > > In any case, I need to figure out how to get the changes from "company/ > repo_c" into "developer/repo_c" and then onto the developers laptop. > How do I do this? > > Thanks. > > > --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "GitHub" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/github?hl=en -~----------~----~----~----~------~----~------~--~---
