Using Git/Github with a two person team?

Question

I have used git and github personally for a while now. But, I am going to add another collaborator to the project and need them to be able to work on it as well.

• How can we both be working on files, then push them back to the master?

• How can we both always have the latest changes?

• What is the best way to work with a 2-3 person team with git?

Answer 1

• Your repositories are separate and complete copies. As long as your edits don't conflict by line, they will merge automatically. If they do conflict by line, you can sort it out manually when you sync repositories.
• Run a git pull before working on a file. Run a git push when you put something to the master.
• Github would work just fine. A network share would also be functional when setup as a bare repository. You can also host your own git daemon service.