Branching & Merging

This lab is designed to help you understand how branching and merging works, including creating branches and merging changes through the pull request process.

Estimated time to complete: 1 hour

---

Overview

You will copy/paste an existing template HTML file to create your own HTML file. That template has three sections for you to add your favorite quotes. For each quote section, commit your changes. The complete exercise will walk you through creating your branch, making changes locally, pushing your changes, and merging them into the main branch through the pull request process.

Requirements

• Local setup for Git and connection to ADO (see Getting Started)
• Referenced content:
  • Branching & Merging
  • Pull Requests
  • Ticket-based Engineering with ADO Boards

Setup

Create a fork from the Git branching & merging repository to work on your own Git repo. Only create one fork for your workshop, whether this is a for a team or individual.

Create a new ticket as a Product Backlog Item in ADO Boards within the Dojo Sandbox under the Git Branching & Merging lab feature. You can copy/paste the ticket details from the feature.