Merge pull request #50856 from lootle1/MR114

Technical Review 1055087: Settle competing commits by using merge con…

Author: JillGrant615

learn-pr/github/resolve-merge-conflicts-github/1-introduction.yml

@@ -4,7 +4,7 @@ title: Introduction
 metadata:
   title: Introduction
   description: Learn to settle overlapping commits across branches by using merge conflict resolution.
-  ms.date: 12/04/2023
+  ms.date: 06/10/2025
   author: a-a-ron
   ms.author: aastewar
   ms.topic: unit

learn-pr/github/resolve-merge-conflicts-github/2-what-are-merge-conflicts.yml

@@ -4,7 +4,7 @@ title: What are merge conflicts?
 metadata:
   title: What are merge conflicts?
   description: Learn to settle overlapping commits across branches by using merge conflict resolution.
-  ms.date: 12/04/2023
+  ms.date: 06/10/2025
   author: a-a-ron
   ms.author: aastewar
   ms.topic: unit

learn-pr/github/resolve-merge-conflicts-github/3-manage-merge-conflicts.yml

@@ -4,7 +4,7 @@ title: Exercise - Manage merge conflicts
 metadata:
   title: Exercise - Manage merge conflicts
   description: Learn to settle overlapping commits across branches by using merge conflict resolution.
-  ms.date: 12/04/2023
+  ms.date: 06/10/2025
   author: a-a-ron
   ms.author: aastewar
   ms.topic: unit

learn-pr/github/resolve-merge-conflicts-github/4-knowledge-check.yml

@@ -4,7 +4,7 @@ title: Module assessment
 metadata:
   title: Module assessment
   description: Check your knowledge about merge conflict resolution.
-  ms.date: 12/04/2023
+  ms.date: 06/10/2025
   author: a-a-ron
   ms.author: aastewar
   ms.topic: unit

learn-pr/github/resolve-merge-conflicts-github/5-summary.yml

@@ -3,8 +3,8 @@ uid: learn.github.merge-conflict-resolution-github.5-summary
 title: Summary
 metadata:
   title: Summary
-  description: Review what you've learned.
-  ms.date: 12/04/2023
+  description: Review what you learned.
+  ms.date: 06/10/2025
   author: a-a-ron
   ms.author: aastewar
   ms.topic: unit

learn-pr/github/resolve-merge-conflicts-github/includes/2-what-are-merge-conflicts.md

@@ -55,4 +55,4 @@ In addition to mitigating the impact of merge conflicts, pulling updates also al
 
 The `git rebase` (or `git pull --rebase`) command rewrites your branch history to use the current HEAD commit of the base branch as its base. In other words, your branch is updated to behave as though it were only branched from the current state of the base branch. This rebase means that all of your changes are compared to the latest state of the base branch, and not the original commit you originally branched from. Rebasing can make history easier to track after your eventual merge, because your commits will follow the previous parallel commits in a linear fashion. It's a good practice to rebase your branch immediately prior to merging upstream.
 
-Learn more [about Git rebase](https://docs.github.com/get-started/using-git/about-git-rebase) and [resolving merge conflicts after a Git rebase](https://docs.github.com/get-started/using-git/resolving-merge-conflicts-after-a-git-rebase).
+Learn more [about Git rebase](https://docs.github.com/get-started/using-git/about-git-rebase) and [resolving merge conflicts after a Git rebase](https://docs.github.com/get-started/using-git/resolving-merge-conflicts-after-a-git-rebase).

learn-pr/github/resolve-merge-conflicts-github/index.yml

@@ -1,20 +1,20 @@
 ### YamlMime:Module
 uid: learn.github.merge-conflict-resolution-github
 metadata:
-  title: "Settle competing commits by using merge conflict resolution on GitHub"
+  title: "Settle Competing Commits by Using Merge Conflict Resolution on GitHub"
   description: Learn to settle overlapping commits across branches by using merge conflict resolution.
-  ms.date: 12/04/2023
+  ms.date: 06/10/2025
   author: a-a-ron
   ms.author: aastewar
   ms.topic: module
   ms.service: github
 title: "Settle competing commits by using merge conflict resolution on GitHub"
 summary: Learn to settle overlapping commits across branches by using merge conflict resolution.
 abstract: |
-  In this module, you will:
-  - Understand how merging happens and what causes merge conflicts
-  - Resolve simple and complex merge conflicts with ease
-  - Share best practices to reduce merge conflicts with your team
+  In this module, you'll:
+  - Understand how merging happens and what causes merge conflicts.
+  - Resolve simple and complex merge conflicts with ease.
+  - Share best practices to reduce merge conflicts with your team.
 prerequisites: |
   - A GitHub account
   - The ability to navigate and edit files in GitHub