Git commands

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

Get their changes:

Checkout the branch where you want to merge:

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

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

No tags for this post.

Leave a Reply

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