git question
git question
- Subject: git question
- From: Theodore Petrosky <email@hidden>
- Date: Wed, 14 Nov 2012 10:25:40 -0800 (PST)
I hope I have this correctly setup, I just want to confirm it with you git guys.
I forked the wonder repo to my own area on github, then I created a folder on the root area of my user on my mac and cd'd into it.
cd ~/Repository and cloned my fork:
git clone https://github.com/tedpet/wonder.git
so if I understand correctly. there exists now the original Wonder repo (that I can not write to), and there exists a copy (fork) in my github account. Then there is the copy (clone) on my Mac.
at this moment in time they are all equal.
I added to my local copy:
git remote add upstream https://github.com/projectwonder/wonder.git
and:
git checkout integration
So now my local copy knows about the original projectwonder repository on github and I am in the integration branch.
so here is the pertinent conundrum. I want to make sure my local Wonder repo is up to date with what ever youse guys are doing with project wonder.
so in the terminal I navigated to the wonder repro and issued:
git fetch upstream
git merge upstream/integration
If I understand correctly, my local repository is now up to date with the projectwonder/wonder.git repo. However, my fork in my user account on github is not.
So if I never intend to make changes to Wonder, I am done. If I want to fix a bug in project Wonder or add comments or documentation, I need to push from my local repo to my forked copy on github, then get these changes/fixes to someone with write capability to add it to the project.
Does anyone see that I am stepping on myself somewhere?
Thanks for looking at this rambling mess.
Ted
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Webobjects-dev mailing list (email@hidden)
Help/Unsubscribe/Update your Subscription:
This email sent to email@hidden