Working as a team using GitHub, handling and resolving conflicts in code

GitHub and Team Services really come into their own when working in teams. The effect of collaborative effort is quite powerful. Sometimes though, it can be a bit challenging. Let us have a look at using GitHub to work in a team setup.

Getting ready

We will be using the existing GitHubDemo app checked in to GitHub. Let's assume that a new developer (let's call him John) has joined the team. Before you can let him push code to your branch, you need to add him as a collaborator. To do this, log in to GitHub and click on the Settings tab in your GitHubDemo repository. Click on Collaborators in the menu to the left.

You can then search for collaborators to add by entering their GitHub...