Skip to content

Switch items 2 and 3 in the README: You can't resolve a nonexistent merge conflict #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Switch items 2 and 3 in the README: You can't resolve a nonexistent merge conflict #42

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ Merge conflicts happen when two people make changes to the same file on GitHub
In this course, you will:

1. Create a pull request
2. Resolve a merge conflict
3. Create a merge conflict
2. Create a merge conflict
3. Resolve a merge conflict
4. Merge your pull request

### How to start this course
Expand Down