I forked a project from here: https://github.com/chbatey/scassandra-java-client to a copy attached to my own account here: https://github.com/apojha/scassandra-java-client.
However, if user chbatey makes any changes to his version of the codebase, I want to keep up to date with his changes by continually merging them into my repo.
To merge changes on his repo to my copy, I added his repository as a remote repo.
----------------------------
Before, the only branch is my own origin/master and the only remote project is my own:
bash-3.2$ git branch -r
origin/HEAD -> origin/master
origin/master
bash-3.2$ git remote -v
origin git@github.com:apojha/scassandra-java-client.git (fetch)
origin git@github.com:apojha/scassandra-java-client.git (push)
----------------------------
----------------------------
After, his branch has been added (upstream/master) and there is a new remote repo called upstream:
bash-3.2$ git branch -r
origin/HEAD -> origin/master
origin/master
upstream/master
bash-3.2$ git remote -v
origin git@github.com:apojha/scassandra-java-client.git (fetch)
origin git@github.com:apojha/scassandra-java-client.git (push)
upstream git@github.com:chbatey/scassandra-java-client.git (fetch)
upstream git@github.com:chbatey/scassandra-java-client.git (push)
----------------------------
Now, if I want to pull his changes I execute the following:
which pulls any commits on 'upstream' into my master.
However, if user chbatey makes any changes to his version of the codebase, I want to keep up to date with his changes by continually merging them into my repo.
To merge changes on his repo to my copy, I added his repository as a remote repo.
Step 1:
Navigate to where I have checked out my fork of his project.----------------------------
Before, the only branch is my own origin/master and the only remote project is my own:
bash-3.2$ git branch -r
origin/HEAD -> origin/master
origin/master
bash-3.2$ git remote -v
origin git@github.com:apojha/scassandra-java-client.git (fetch)
origin git@github.com:apojha/scassandra-java-client.git (push)
----------------------------
Step 2:
Execute the following command to add a new remote repo called 'upstream' (this name can be anything):
git remote add upstream git@github.com:chbatey/scassandra-java-client.git
----------------------------
After, his branch has been added (upstream/master) and there is a new remote repo called upstream:
bash-3.2$ git branch -r
origin/HEAD -> origin/master
origin/master
upstream/master
bash-3.2$ git remote -v
origin git@github.com:apojha/scassandra-java-client.git (fetch)
origin git@github.com:apojha/scassandra-java-client.git (push)
upstream git@github.com:chbatey/scassandra-java-client.git (fetch)
upstream git@github.com:chbatey/scassandra-java-client.git (push)
----------------------------
Now, if I want to pull his changes I execute the following:
git pull upstream master
which pulls any commits on 'upstream' into my master.
No comments:
Post a Comment