Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
This is my first attempt at using Github’s shared collaboration model to work on a project with a friend. I have started a project and added him as a collaborator. After commiting changes how can he update the repo on his computer and likewise how can I keep the repo updated? What if there are collisions and how are they resolved. I’ll be grateful if someone could highlight some best practices or point to some resource.
Thanks a lot!
You probably want to read http://help.github.com/remotes/
To answer some of your questions:
To update his repo, your friend would run git fetch, and afterwards git merge. git will then either merge the files directly, if there are no conflicts or ask him to resolve the conflicts manually, if the conflicts can’t be resolved.