Git commands

Add their github fork repo as a remote to a clone of your own repo:

git remote add other-guys-repo <url to other guys repo>

Get their changes:

git fetch other-guys-repo

Checkout the branch where you want to merge:

git checkout my_new_branch

Merge their changes in (assuming they did their work on the master branch):

git merge other-guys-repo/master

Resolve conflicts, commit the resolutions and voila.

git add -A // To track all files

git commit -am “message” // To commit changes

git push origin master // Push your local changes to github

Leave a Reply

Your email address will not be published. Required fields are marked *

This site uses Akismet to reduce spam. Learn how your comment data is processed.