File tree Expand file tree Collapse file tree 6 files changed +7
-7
lines changed
learn-pr/github/resolve-merge-conflicts-github Expand file tree Collapse file tree 6 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ title: Introduction
4
4
metadata :
5
5
title : Introduction
6
6
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
8
8
author : a-a-ron
9
9
ms.author : aastewar
10
10
ms.topic : unit
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ title: What are merge conflicts?
4
4
metadata :
5
5
title : What are merge conflicts?
6
6
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
8
8
author : a-a-ron
9
9
ms.author : aastewar
10
10
ms.topic : unit
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ title: Exercise - Manage merge conflicts
4
4
metadata :
5
5
title : Exercise - Manage merge conflicts
6
6
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
8
8
author : a-a-ron
9
9
ms.author : aastewar
10
10
ms.topic : unit
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ title: Module assessment
4
4
metadata :
5
5
title : Module assessment
6
6
description : Check your knowledge about merge conflict resolution.
7
- ms.date : 12/04/2023
7
+ ms.date : 06/10/2025
8
8
author : a-a-ron
9
9
ms.author : aastewar
10
10
ms.topic : unit
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ title: Summary
4
4
metadata :
5
5
title : Summary
6
6
description : Review what you've learned.
7
- ms.date : 12/04/2023
7
+ ms.date : 06/10/2025
8
8
author : a-a-ron
9
9
ms.author : aastewar
10
10
ms.topic : unit
Original file line number Diff line number Diff line change 1
1
# ## YamlMime:Module
2
2
uid : learn.github.merge-conflict-resolution-github
3
3
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"
5
5
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
7
7
author : a-a-ron
8
8
ms.author : aastewar
9
9
ms.topic : module
You can’t perform that action at this time.
0 commit comments