Start free

Browse › Azure DevOps

Can You Manage Merge Conflicts in Azure DevOps Services?

Advanced

Part of Azure DevOps Topic: Azure

Counts towardsCompTIA Cloud+ badge

Access

StationX Infrastructure Labs — 3 attempts per lab

🔒 Add StationX Infrastructure Labs — $149 / year · 3 attempts per lab

Already have access? Sign in.

New to this? Try a free practice lab — a scripted hacking challenge in your browser, no account needed.

What you'll do

In this lab, you will add large file support to an Azure DevOps Git repository and manage conflicts between users.

  1. Create a new Azure DevOps Git repository and clone it to your development machine
  2. Initialize the project
  3. Set up a feature branch structure for branches for your Git repo in Azure DevOps
  4. Install git-lfs on the dev environments for your primary user
  5. Check in and commit a ZIP file for the project from the primary account
  6. Add a secondary user to your project, set up their large file support, and commit a new version of the ZIP file to the repo
  7. Attempt to check in a new version of the file as the primary user, resulting in a merge conflict
  8. Resolve the merge conflict
  9. Create a merge request to the master branch as the primary user and approve it as the secondary user

Note: Once you begin the lab, you will not be able to pause, save, or return to your lab. Please ensure that you have set aside enough time to complete the lab before you start.

Roadmaps that use this lab