Version Control and Team Collaboration with Git
UGIT
1 days
Interested in a private company training? Request it here.
Azure DevOps vs. GitHub
Azure DevOps is the collaboration hub offered by Microsoft for everyone in the development team, including project managers, testers, architects, developers and end-users. Likewise, GitHub is used mainly for open source projects.
- Introduction to Azure DevOps
- Using GitHub
- LAB: Creating and configuring your 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. Here we discuss Git source control.
- 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 a central place for all your team's code and changes. In Git these are known as remote repositories. Here we discuss team collaboration with Git.
- 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 them with others.
- 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 codebase comes with its own challenges. Factors 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 maintains 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
Your team is using Git, but you have the feeling you are not fully utilizing the possibilities of Git source control. In this training, you will learn about practical use of Git, including managing repositories in your day-to-day work, making commits, performing pulls and pushes, and checking history. More advanced topics are also covered, such as branching, merging, and ending with using rebase and pull requests.
Developers who need to use Git for Source Control.