From: www To: [email protected] Sent: Wednesday, February 20, 2013 9:32 PM Subject: [git-users] how to get the code changes of another person to my local code?
Hi: I have used git for a while, but only for keeping tracking of the changes of my own in my own computer. I have never used git to cooperate with others. My naive question is: if somebody on the other city and me started with the same set files(or code), after a while, he has modified his files, how can I get all his changes to my files by using git? Thank you very much. Usually you would agree to have a 'public' repository you can both access. It is normal that that repo is 'bare' - i.e. it doesn't actually have a working directory so neither of you could corrupt it. You would use separate branches for your own work. These are easy to create and use. You push your branches to the repo which then has the multi-branched composite of everybodies published work You then pick up a copy of your collegues branches and make comparisons when you want to merge changes, or generate a personal branch on top of their work if you are extending it. Git uses the sha1 hashes to verify and validate each bit of content, the file and directory structure, and the history linkages. So if you have the same sha1 hash as someone else you have an exact copy of what they have. If the sha1 is different you have a personal variant. Git can trace back through the history links to find the common base commit at which you, or your collegue, branched off your development. There are a number of good books and web sites. Such as Git magic http://www-cs-students.stanford.edu/~blynn/gitmagic/ Pro-git / git community book http://git-scm.com/book And http://think-like-a-git.net/ The branching model http://nvie.com/posts/a-successful-git-branching-model/ is often refernced as well. Philip -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/groups/opt_out.
