In general, whats the best way to use a repo for collaborators? Should we both just push and pull from the master repo or would we have a branch for each collaborator and then merge when appropriate? Apologies if this is a stupid/basic question; git noob here ;-)Thanks.

Git supports a number of different workflows. See here for some conceptual diagrams to see some basic options: http://git-scm.com/about/distributed To me, branches aren't typically related 1:1 with collaborators...that's what repositories themselves are for. Branches are for keeping changes local to the task at hand.

Whats the best way to use a git repo for collaborators?

1 Answers

Git supports a number of different workflows. See here for some conceptual diagrams to see some basic options: http://git-scm.com/about/distributed

To me, branches aren't typically related 1:1 with collaborators...that's what repositories themselves are for. Branches are for keeping changes local to the task at hand.