I use git with my friend to collaborate on a project. He created a repo in github consisting folders of each of our names, so everytime i update something, I upload it to th
Answering your first two questions in turn:
origin
refers to the GitHub repository in each case, you should just run git fetch origin
. Then the "remote-tracking branch" origin/master
will be at the version of master on GitHub and you can compare it with your master with git diff master origin/master
to see the difference between those two versions, or git log master...origin/master
to see the commits which are unique to either master
or origin/master
.With regard to whether there is a better way to do what you're doing, I'm afraid I don't understand clearly enough what you're doing or trying to achieve to comment sensibly. However, having folders in the repository named after each developer with (presumably) very similar source code in them sounds a little suspect - you would typically use branches to deal with divergent versions of the same code.