Version Control and Team Collaboration with Git

Azure DevOps Team Projects

Azure DevOps is the collaboration hub offered by Microsoft for everyone in the development team, including project managers, testers, architects, developers and end-users. Here we will create a team project and configure it.

• Development Processes
• Team Projects and Process Templates
• LAB: Creating and configuring your team project

Using Git

Sources are probably the most important part in any software project and we need a way to keep track of all sources and all changes. Azure Repos gives you the choice between TFVS and Git for storing your source history, branching, merging and everything else required.

• Version Control concepts
• Distributed Source Control with Git
• Git Clients: Command Line, Visual Studio or Visual Studio Code
• Creating a local repository
• Configuring your git repository
• Checking the status of your repo
• Staging files
• Committing files, and then amending it
• Comparing changes in files
• Reverting commits
• Finding the bad change using git bisect
• LAB: Working with a local repository

Team collaboration with remote repositories

Multiple developers working on the same code base requires some central place for all your code and changes. In git these are known as remote repositories

• Team collaboration with remote repositories
• Cloning a remote repository
• Synchronizing with a remote repository
• Resolving conflicts
• Using Git Hooks
• LAB: Working with remote repositories

Working in isolation with branches

How can we avoid code changes from one developer interfering with code from others? Branching has always been used to allow developers to complete their changes before integrating with with other's.

• Adding branches to your workflow
• Branching Strategies - Using GitFlow
• Merge vs. Rebase - keeping a linear history
• Different Merge Strategies, i.e. Squash Merge
• Managing your branches
• LAB: Working with branches in git

Team Collaboration with Pull Requests

Working as a team on the same code base comes with its own challenges. Things like false cognates, code conventions, SOLID principles etc. could result in good or bad code quality. Pull requests allow you to ensure that your code keeps its high quality.

• Protecting your branches with pull requests
• Ensuring high quality code with Pull Requests
• Versioning with Git Tags
• Using Forks
• LAB: Team collaboration with Pull Requests