Git Hands-on Workshop with Azure DevOps

• Basic knowledge of version control concepts
• Familiarity with software development practices

Audience

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

Git is a powerful version control system widely used for tracking changes in source code during software development. Azure DevOps integrates Git with powerful collaboration and CI/CD tools to enhance software delivery.

This instructor-led, live training (online or onsite) is aimed at intermediate-level developers and DevOps engineers who wish to gain hands-on experience with Git and Azure DevOps, focusing on branch management, merge strategies, conflict resolution, and effective use of graphical clients.

By the end of this training, participants will be able to:

• Understand fundamental Git concepts and workflows.
• Effectively manage branches and merges in collaborative environments.
• Resolve conflicts using best practices in real-life scenarios.
• Utilize graphical clients (SourceTree and GitKraken) for Git management.
• Perform practical Git operations both from the console and graphical interfaces.
• Work with Git in Azure DevOps for repository integration and version control.

Format of the Course

• Interactive lecture and discussion.
• Lots of exercises and practice.
• Hands-on implementation in a live-lab environment.

Course Customization Options

• To request a customized training for this course, please contact us to arrange.

Introduction to Git and Azure DevOps

• Overview of Git version control system
• Introduction to Azure DevOps and Git integration
• Setting up the environment: Git, SourceTree, GitKraken, and Azure DevOps

Fundamental Git Concepts

• Creating and cloning repositories
• Basic Git commands: init, add, commit, push, pull
• Branching concepts and strategies

Branch and Merge Management

• Branching best practices for collaborative projects
• Managing branches with SourceTree and GitKraken
• Exercises: Creating and merging branches

Merge Techniques and Conflict Resolution

• Types of merges: Merge, Fast forward merge, Squash and merge, Rebase and merge
• Conflict resolution strategies and best practices
• Hands-on exercises: Simulating conflicts and resolving them

Console vs Graphical Client Operations

• Performing Git operations from the console
• Managing repositories using SourceTree (main exercises) and GitKraken (demonstrations)
• Pros and cons of using graphical clients

Advanced Git Techniques

• Stage, Reverting, Resetting, and Unstaging changes
• Cherry-picking commits and practical applications
• Reverting and rolling back changes safely

Working with Azure DevOps and Git

• Setting up Git repositories in Azure Repos
• Integrating Git with Azure DevOps pipelines
• Managing permissions and access control

Team Collaboration and Real-World Scenarios

• Branching strategies in large projects
• Handling conflicts in team environments
• Best practices for version control in DevOps workflows

Summary and Next Steps