Jason, Is your local repository a clone of the official (insoshi/insoshi) repository or of your forked repository?
If you don't remember offhand, you can run "git config -l" and see what the setting for remote.origin.url is. If it's insoshi/insoshi, then you'll see "git://github.com/insoshi/insoshi.git" Our documentation (docs.insoshi.com) recommends that you start with a clone of official repository and add your forked repository as a remote connection. It's not the only way to set things up but this particular configuration makes it easier to pull in our updates because the clone automatically sets up the tracking of official master branch to your local master. If you did start off with a clone of your forked repository, you can follow Nick's instructions (thanks Nick!). I'm working on updating our Git Guides with a bit more information on working in teams, pulling/pushing updates and merge/rebase. Just so I know what I should be focusing on, are there any particular issues/questions that you want answers on or more information? Long On Fri, May 16, 2008 at 9:13 AM, Nick Chapman <[EMAIL PROTECTED]> wrote: > > I'm not a git pro, but this seems to work for me. You can add insoshi/ > insoshi as a remote repository and pull changes from it. > > git remote add realdeal git://github.com/insoshi/insoshi.git > > "realdeal" is what I happened to name it. You can name the remote > repository whatever you'd like. You then do the following to get > changes into your fork: > > git pull realdeal master > > "master" there is the branch into which you want to pull changes. You > can then do a "git push" to have all the changes in your fork on github. > > Hope that helps. > > Nick Chapman > > On May 16, 2008, at 7:47 AM, Jason Batchelor wrote: > > > > > I guess I'm not quite understanding how the development process is > > supposed to go, with Insoshi and GitHub. > > > > I'm used to this workflow: > > > > 1) Get latest updates from source control > > 2) Make changes > > 3) Update the source control > > > > Now, I've got this "fork" on GitHub, and I'm trying to get the patch > > that Michael put into place yesterday, but I don't understand how I'm > > supposed to get the latest updates into my fork. I also don't know if > > my development site on my local computer is linked to my fork, or to > > the main Insoshi project. > > > > Anyone willing to step this newbie through the process of getting > > these concepts clarified? > > > > Thanks, > > > > Jason M. Batchelor > > > > > > > > > > -- Long Nguyen [EMAIL PROTECTED] --~--~---------~--~----~------------~-------~--~----~ Insoshi developer site: http://dogfood.insoshi.com/ Insoshi documentation: http://docs.insoshi.com/ You received this message because you are subscribed to the Google Groups "Insoshi" 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/insoshi?hl=en -~----------~----~----~----~------~----~------~--~---
