5
5
Add your open source license, GitHub uses Creative Commons Attribution 4.0 International.
6
6
-->
7
7
8
- <img src=https://user-images.githubusercontent.com/1221423/156947036-03513bb1-3dd4-412d-b89a-605b3170b73a.svg width=300 align=right>
9
-
10
8
# Resolve merge conflicts
11
9
12
10
_ Merge conflicts are a normal part of working in Git. Learn why they happen and how to resolve them with ease._
@@ -21,7 +19,7 @@ _Merge conflicts are a normal part of working in Git. Learn why they happen and
21
19
-->
22
20
23
21
<details id =0 open >
24
- <summary ><h2 >:golf: Start</h2 ></summary >
22
+ <summary ><h2 >Start</h2 ></summary >
25
23
26
24
[ ![ start-course] ( https://user-images.githubusercontent.com/1221423/154366775-5491926f-9ed1-4a4a-a229-0810c0ed7e5e.svg )] ( https://github.com/skills/resolve-merge-conflicts/generate )
27
25
@@ -48,7 +46,7 @@ Merge conflicts happen when two people make changes to the same file on GitHub
48
46
-->
49
47
50
48
<details id =1 >
51
- <summary ><h2 >:lotus_position: Step 1: Resolve a merge conflict</h2 ></summary >
49
+ <summary ><h2 >Step 1: Resolve a merge conflict</h2 ></summary >
52
50
53
51
_ Welcome to "Managing Merge Conflicts"! :wave : _
54
52
@@ -82,7 +80,7 @@ This can be intimidating, but have no fear, Git is smart when it comes to mergin
82
80
-->
83
81
84
82
<details id =2 >
85
- <summary ><h2 >:smiling_imp: Step 2: Create your own conflict</h2 ></summary >
83
+ <summary ><h2 >Step 2: Create your own conflict</h2 ></summary >
86
84
87
85
_ Good job! You've solved a merge conflict! :tada : _
88
86
@@ -111,7 +109,7 @@ We went ahead and added a new file called `references.md` and pushed that change
111
109
-->
112
110
113
111
<details id =3 >
114
- <summary ><h2 >:chipmunk: Step 3: Merge your pull request</h2 ></summary >
112
+ <summary ><h2 >Step 3: Merge your pull request</h2 ></summary >
115
113
116
114
_ Almost there! :heart : _
117
115
@@ -133,7 +131,7 @@ You can now [merge](https://docs.github.com/en/get-started/quickstart/github-glo
133
131
-->
134
132
135
133
<details id =X >
136
- <summary ><h2 >:checkered_flag: Finish</h2 ></summary >
134
+ <summary ><h2 >Finish</h2 ></summary >
137
135
138
136
_ Congratulations friend, you've completed this course!_
139
137
0 commit comments