You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
> When you select **Start course** or **Use this template**, you will be prompted to create a new repository.
28
29
> 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>
29
30
> After you make your own repository, wait about 20 seconds and refresh. I will go to the next step.
30
31
@@ -47,9 +48,9 @@ Merge conflicts happen when two people make changes to the same file on GitHub
47
48
-->
48
49
49
50
<detailsid=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>
51
52
52
-
### Welcome to "Managing Merge Conflicts"! :wave:
53
+
_Welcome to "Managing Merge Conflicts"! :wave:_
53
54
54
55
**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.
55
56
@@ -81,9 +82,9 @@ This can be intimidating, but have no fear, Git is smart when it comes to mergin
81
82
-->
82
83
83
84
<detailsid=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>
85
86
86
-
### Good job! You've solved a merge conflict! :tada:
87
+
_Good job! You've solved a merge conflict! :tada:_
87
88
88
89
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`.
89
90
@@ -110,9 +111,9 @@ We went ahead and added a new file called `references.md` and pushed that change
110
111
-->
111
112
112
113
<detailsid=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>
114
115
115
-
### Almost there! :heart:
116
+
_Almost there! :heart:_
116
117
117
118
You can now [merge](https://docs.github.com/en/get-started/quickstart/github-glossary#merge) your pull request!
118
119
@@ -132,9 +133,9 @@ You can now [merge](https://docs.github.com/en/get-started/quickstart/github-glo
0 commit comments