Skip to content

Commit f8a7fb4

Browse files
committed
Technical Review 1055087: Settle competing commits by using merge conflict resolution on GitHub
1 parent 5d7f10a commit f8a7fb4

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: Introduction
44
metadata:
55
title: Introduction
66
description: Learn to settle overlapping commits across branches by using merge conflict resolution.
7-
ms.date: 12/04/2023
7+
ms.date: 06/10/2025
88
author: a-a-ron
99
ms.author: aastewar
1010
ms.topic: unit

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: What are merge conflicts?
44
metadata:
55
title: What are merge conflicts?
66
description: Learn to settle overlapping commits across branches by using merge conflict resolution.
7-
ms.date: 12/04/2023
7+
ms.date: 06/10/2025
88
author: a-a-ron
99
ms.author: aastewar
1010
ms.topic: unit

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: Exercise - Manage merge conflicts
44
metadata:
55
title: Exercise - Manage merge conflicts
66
description: Learn to settle overlapping commits across branches by using merge conflict resolution.
7-
ms.date: 12/04/2023
7+
ms.date: 06/10/2025
88
author: a-a-ron
99
ms.author: aastewar
1010
ms.topic: unit

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: Module assessment
44
metadata:
55
title: Module assessment
66
description: Check your knowledge about merge conflict resolution.
7-
ms.date: 12/04/2023
7+
ms.date: 06/10/2025
88
author: a-a-ron
99
ms.author: aastewar
1010
ms.topic: unit

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: Summary
44
metadata:
55
title: Summary
66
description: Review what you've learned.
7-
ms.date: 12/04/2023
7+
ms.date: 06/10/2025
88
author: a-a-ron
99
ms.author: aastewar
1010
ms.topic: unit

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
### YamlMime:Module
22
uid: learn.github.merge-conflict-resolution-github
33
metadata:
4-
title: "Settle competing commits by using merge conflict resolution on GitHub"
4+
title: "Settle Competing Commits by Using Merge Conflict Resolution on GitHub"
55
description: Learn to settle overlapping commits across branches by using merge conflict resolution.
6-
ms.date: 12/04/2023
6+
ms.date: 06/10/2025
77
author: a-a-ron
88
ms.author: aastewar
99
ms.topic: module

0 commit comments

Comments
 (0)