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
Copy file name to clipboardExpand all lines: README.md
+10-10Lines changed: 10 additions & 10 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -6,24 +6,24 @@ _Learn why conflicts happen and how to resolve them._
6
6
7
7
Merge conflicts happen when two people make changes to the same file on GitHub—a common occurrence when you’re working with others. While resolving differences might involve some discussion, merge conflicts don’t have to be scary. This course guides you through the steps to finding the best merge conflict solution, so your team can keep building.
8
8
9
-
-**Who is this for**: New developers, new GitHub users, users new to Git, students, managers, teams.
10
-
-**What you'll learn**: What merge conflicts are, how you resolve merge conflicts, how to reduce merge conflicts.
11
-
-**What you'll build**: We'll work with a short Markdown resume file in this course.
12
-
-**Prerequisites**: We recommend taking [Introduction to GitHub](https://github.com/skills/introduction-to-github) prior to this course.
13
-
-**How long**: This course takes less than 30 minutes to complete.
9
+
-**Who is this for**: New developers, new Git/GitHub users
10
+
-**What you'll learn**: We'll introduce the tools for inspecting and resolving a merge conflict.
11
+
-**What you'll build**: The reviewing of conflicting changes proposed to a simple Markdown.
12
+
-**Prerequisites**:
13
+
- Skills Exercise: [Introduction to GitHub](https://github.com/skills-dev/introduction-to-github)
14
+
-**How long**: less than 30 minutes
14
15
15
16
In this exercise, you will:
16
17
17
-
1. Create a pull request
18
-
2. Resolve a merge conflict
19
-
3. Create a merge conflict
20
-
4. Merge your pull request
18
+
1. Learn the causes of a merge conflict.
19
+
2. The tools for resolving a merge conflict.
20
+
3. When and how to resolve a merge conflict.
21
21
22
22
### How to start this course
23
23
24
24
Simply copy the exercise to your account, then give your favorite Octocat (Mona) **about 20 seconds** to prepare the first lesson, then **refresh the page**.
0 commit comments