Skip to content

Commit 4ed3707

Browse files
committed
Update step to H2, feedback text, start section
1 parent 2f73fb4 commit 4ed3707

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

README.md

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@ _Merge conflicts are a normal part of working in Git. Learn why they happen and
2121
-->
2222

2323
<details id=0 open>
24-
<summary><strong>:golf: Start</strong></summary>
24+
<summary><h2>:golf: Start</h2></summary>
2525

26-
### [![start-course](https://user-images.githubusercontent.com/1221423/154366775-5491926f-9ed1-4a4a-a229-0810c0ed7e5e.svg)](https://github.com/githublearn/resolve-merge-conflicts/generate)
26+
[![start-course](https://user-images.githubusercontent.com/1221423/154366775-5491926f-9ed1-4a4a-a229-0810c0ed7e5e.svg)](https://github.com/githublearn/resolve-merge-conflicts/generate)
2727

28+
> When you select **Start course** or **Use this template**, you will be prompted to create a new repository.
2829
> We recommend creating a public repository, as private repositories will [use Actions minutes](https://docs.github.com/en/billing/managing-billing-for-github-actions/about-billing-for-github-actions).<br>
2930
> After you make your own repository, wait about 20 seconds and refresh. I will go to the next step.
3031
@@ -47,9 +48,9 @@ Merge conflicts happen when two people make changes to the same file on GitHub
4748
-->
4849

4950
<details id=1>
50-
<summary><strong>:lotus_position: Step 1: Resolve a merge conflict</strong></summary>
51+
<summary><h2>:lotus_position: Step 1: Resolve a merge conflict</h2></summary>
5152

52-
### Welcome to "Managing Merge Conflicts"! :wave:
53+
_Welcome to "Managing Merge Conflicts"! :wave:_
5354

5455
**What is a _merge conflict_?**: A **merge conflict** occurs when changes are made to the same part of the same file on two different branches. You usually find out about conflicts in a pull request.
5556

@@ -81,9 +82,9 @@ This can be intimidating, but have no fear, Git is smart when it comes to mergin
8182
-->
8283

8384
<details id=2>
84-
<summary><strong>:smiling_imp: Step 2: Create your own conflict</strong></summary>
85+
<summary><h2>:smiling_imp: Step 2: Create your own conflict</h2></summary>
8586

86-
### Good job! You've solved a merge conflict! :tada:
87+
_Good job! You've solved a merge conflict! :tada:_
8788

8889
Resolving a conflict doesn't automatically merge the pull request in GitHub. Instead, it stores the resolution of the conflict in a merge commit and allows you and your team to keep working. To resolve a conflict, GitHub performs what is known as a *reverse merge*. This means that the changes from the `main` branch were merged into your `my-resume` branch. With a reverse merge, only the `my-resume` branch is updated. This allows you to test the resolved changes on your branch before you merge it into `main`.
8990

@@ -110,9 +111,9 @@ We went ahead and added a new file called `references.md` and pushed that change
110111
-->
111112

112113
<details id=3>
113-
<summary><strong>:shipit: Step 3: Merge your pull request</strong></summary>
114+
<summary><h2>:shipit: Step 3: Merge your pull request</h2></summary>
114115

115-
### Almost there! :heart:
116+
_Almost there! :heart:_
116117

117118
You can now [merge](https://docs.github.com/en/get-started/quickstart/github-glossary#merge) your pull request!
118119

@@ -132,9 +133,9 @@ You can now [merge](https://docs.github.com/en/get-started/quickstart/github-glo
132133
-->
133134

134135
<details id=X>
135-
<summary><strong>:checkered_flag: Finish</strong></summary>
136+
<summary><h2>:checkered_flag: Finish</h2></summary>
136137

137-
### Congratulations friend, you've completed this course!
138+
_Congratulations friend, you've completed this course!_
138139

139140
<img src=https://octodex.github.com/images/benevocats.jpg alt=celebrate width=300 align=right>
140141

0 commit comments

Comments
 (0)