Git with Azure DevOps

Manage source code and collaborate effectively using Git and Azure DevOps. This hands-on course covers core Git concepts, branching strategies, conflict resolution, and repository management using both the command line and graphical clients, so you can work confidently in real-world collaborative development environments.

What You'll Learn

By the end of this course, you will be able to:

• Create and manage Git repositories using core commands and workflows
• Apply branching strategies and merge techniques suited to collaborative projects
• Resolve merge conflicts confidently using best practices and real-world scenarios
• Perform Git operations from both the console and graphical clients including SourceTree and GitKraken
• Use advanced Git techniques including cherry-picking, reverting, resetting, and rebasing
• Set up and manage Git repositories in Azure Repos and integrate them with Azure DevOps pipelines

Requirements

• Basic familiarity with version control concepts
• General understanding of software development practices

Audience

• Developers working with version control systems
• DevOps Engineers managing code repositories and pipelines
• Development Teams collaborating on software projects using Git and Azure DevOps

Topics

Introduction to Git and Azure DevOps

• Overview of Git and Its Role in Modern Software Development
• Introduction to Azure DevOps and Git Integration
• Setting Up the Environment with Git, SourceTree, GitKraken, and Azure DevOps

Core Git Concepts and Workflows

• Creating and Cloning Repositories
• Staging, Committing, Pushing, and Pulling Changes
• Understanding Branching Concepts and Common Strategies

Branch and Merge Management

• Applying Branching Best Practices for Collaborative Projects
• Managing Branches with SourceTree and GitKraken
• Creating and Merging Branches in Practice

Merge Techniques and Conflict Resolution

• Understanding Merge Types: Standard Merge, Fast Forward, Squash, and Rebase
• Conflict Resolution Strategies and Best Practices
• Simulating and Resolving Conflicts in Hands-On Exercises

Console vs. Graphical Client Operations

• Performing Git Operations from the Command Line
• Managing Repositories with SourceTree and GitKraken
• Comparing the Pros and Cons of Console and Graphical Workflows

Advanced Git Techniques

• Staging, Unstaging, Reverting, and Resetting Changes
• Cherry-Picking Commits and Applying Them Across Branches
• Rolling Back Changes Safely in a Shared Repository

Working with Azure DevOps and Git

• Setting Up and Managing Git Repositories in Azure Repos
• Integrating Git with Azure DevOps Pipelines
• Configuring Permissions and Access Control

Team Collaboration and Real-World Scenarios

• Branching Strategies for Large and Distributed Teams
• Handling Conflicts and Coordinating Changes in Team Environments
• Best Practices for Version Control in DevOps Workflows