Take the 2-minute tour ×
Ask Ubuntu is a question and answer site for Ubuntu users and developers. It's 100% free, no registration required.

I have a problem. I forked a project in github.com. I made my changes, commited it and pushed to the original (what I Forked) repo. But in the original repo there are many changes, so I'd like to merge this with my own fork.

share|improve this question

closed as off topic by dv3500ea, mgunes, Marco Ceppi Nov 5 '10 at 11:21

Questions on Ask Ubuntu are expected to relate to Ubuntu within the scope defined by the community. Consider editing the question or leaving comments for improvement if you believe the question can be reworded to fit within the scope. Read more about reopening questions here.If this question can be reworded to fit the rules in the help center, please edit the question.

1 Answer 1

up vote 2 down vote accepted

You need to add that original repo to your remotes.

Use git remote add to do so.
From the GitHub help page on forks:

Once the clone is complete your repo will have a remote named “origin” that points to your fork on github. Don’t let the name confuse you, this does not point to the original repo you forked from.
To help you keep track of that repo we will add another remote named “upstream”:

$ cd github-services
$ git remote add upstream git://github.com/pjhyett/github-services.git
$ git fetch upstream
share|improve this answer
    
Thanks, If I am home I try it and give you the points. –  Roberto Nov 5 '10 at 8:07

Not the answer you're looking for? Browse other questions tagged or ask your own question.