Merged with main

azure_devops/readme.md

@@ -15,6 +15,7 @@ This lab bootstraps a Valet environment using GitHub Codespaces and enables you
 1. Verify you are in your own Repository created from the landing page [Valet Labs](https://github.com/valet-customers/labs).
 
 ## Prerequisites
+
 1. Azure DevOps organization. Please identify or create an Azure DevOps organization to use: [Click to create an Azure DevOps Org](https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/create-organization?toc=%2Fazure%2Fdevops%2Fget-started%2Ftoc.json&bc=%2Fazure%2Fdevops%2Fget-started%2Fbreadcrumb%2Ftoc.json&view=azure-devops)
     - Note and store the Azure DevOps organization name for later.
     - Note and store the username you use for your Azure DevOps organization. It will be an email address.
@@ -22,11 +23,7 @@ This lab bootstraps a Valet environment using GitHub Codespaces and enables you
     - Note and store the Azure DevOps project name for later.
 3. Create an Azure DevOps personal access token with the following scopes:
     - To do so, navigate to Sign in to your organization `https://dev.azure.com/{yourorganization}`.
-<<<<<<< HEAD
-    -   Click your `Account management` icon < ===================== I didn't see this
-=======
     - Click your `Account management` icon
->>>>>>> main
     - Click `User settings`.
     - Click `Personal access tokens`.
     - Select `+ New Token`.
@@ -52,6 +49,7 @@ This lab bootstraps a Valet environment using GitHub Codespaces and enables you
     - Copy the PAT somewhere safe and temporary.
 
 ## Codespace secrets
+
 Please add the following Codespace secrets.
 
 - `VALET_GHCR_PASSWORD`: Add `VALET_GHCR_PASSWORD` as the `Name` and the GitHub personal access token created above as the `Value`.
@@ -70,6 +68,7 @@ Steps to create the Codespace secrets. Complete for secret noted above:
 - Click `Add secret`
 
 ## Action secrets
+
 Please add the following Action secrets.
 
 - `AZURE_DEVOPS_ACCESS_TOKEN`: Add `AZURE_DEVOPS_ACCESS_TOKEN` as the `Name` and the Azure DevOps personal access token created above as the value.
@@ -87,6 +86,7 @@ Steps to create the Actions secret. Complete for secret noted above:
 ## Azure DevOps project creation
 
 Run the Actions workflow:
+
 - CLick the `Actions` tab
 - Select the `Valet Bootstrap for Azure DevOps` action
 - Click `Run workflow`
@@ -98,8 +98,8 @@ Run the Actions workflow:
 - Verify the workflow completed successfully. If the workflow did not run successfully you will see a detailed error message.
 
 ### Example ###
-![runaction](https://user-images.githubusercontent.com/26442605/167679930-9bdf6f4f-2e94-4145-aed3-8ee3e8e91d90.png)
 
+![runaction](https://user-images.githubusercontent.com/26442605/167679930-9bdf6f4f-2e94-4145-aed3-8ee3e8e91d90.png)
 
 ## Use Valet with a codespace
 
@@ -116,10 +116,13 @@ Run the Actions workflow:
     - Start using Valet by following along with the [Labs for Azure DevOps](#labs-for-azure-devops).
 
 ### Example ###
+
 ![gh-valet-version](https://user-images.githubusercontent.com/26442605/170106559-e69e669f-a1f6-4c2c-8998-3f089b899704.png)
 
 ## Labs for Azure DevOps
+
 Perform the following labs to test-drive Valet
+
 - [Audit Azure DevOps pipelines using the Valet audit command](valet-audit-lab.md)
 - [Dry run the migration of an Azure DevOps pipeline to GitHub Actions](valet-dry-run-lab.md)
 - [Migrate an Azure DevOps pipeline to GitHub Actions](valet-migrate-lab.md)
@@ -127,7 +130,9 @@ Perform the following labs to test-drive Valet
 - [Forecast: Valet forecast lab](valet-forecast-lab.md)
 
 ## Troubleshoot GH Valet extension
+
 Manually Install the GitHub CLI Valet extension. More information on the [GitHub Valet CLI extension](https://github.com/github/gh-valet)
+
 - Verify you are in the Visual Studio Code terminal
 - Run this command to install the GitHub Valet extension
 - `gh extension install github/gh-valet`