Ecosyste.ms: Awesome

An open API service indexing awesome lists of open source software.

Awesome Lists | Featured Topics | Projects

https://github.com/skills/resolve-merge-conflicts

Learn why conflicts happen and how to resolve them.
https://github.com/skills/resolve-merge-conflicts

git github merge-conflict merge-conflicts skills-course

Last synced: about 12 hours ago
JSON representation

Learn why conflicts happen and how to resolve them.

Host: GitHub
URL: https://github.com/skills/resolve-merge-conflicts
Owner: skills
License: mit
Created: 2022-01-24T22:24:46.000Z (almost 3 years ago)
Default Branch: main
Last Pushed: 2024-03-25T15:34:58.000Z (8 months ago)
Last Synced: 2024-05-29T17:19:57.994Z (5 months ago)
Topics: git, github, merge-conflict, merge-conflicts, skills-course
Homepage:
Size: 54.7 KB
Stars: 127
Watchers: 10
Forks: 95
Open Issues: 1
Metadata Files:
- Readme: README.md
- License: LICENSE

Awesome Lists containing this project

README

# Resolve merge conflicts

_Learn why conflicts happen and how to resolve them._

## Welcome

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.

- **Who is this for**: New developers, new GitHub users, users new to Git, students, managers, teams.
- **What you'll learn**: What merge conflicts are, how you resolve merge conflicts, how to reduce merge conflicts.
- **What you'll build**: We'll work with a short Markdown resume file in this course.
- **Prerequisites**: We recommend taking [Introduction to GitHub](https://github.com/skills/introduction-to-github) prior to this course.
- **How long**: This course takes less than 30 minutes to complete.

In this course, you will:

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

### How to start this course

[![start-course](https://user-images.githubusercontent.com/1221423/235727646-4a590299-ffe5-480d-8cd5-8194ea184546.svg)](https://github.com/new?template_owner=skills&template_name=resolve-merge-conflicts&owner=%40me&name=skills-resolve-merge-conflicts&description=My+clone+repository&visibility=public)

1. Right-click **Start course** and open the link in a new tab.
2. In the new tab, most of the prompts will automatically fill in for you.
- For owner, choose your personal account or an organization to host the repository.
- 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).
- Scroll down and click the **Create repository** button at the bottom of the form.
3. After your new repository is created, wait about 20 seconds, then refresh the page. Follow the step-by-step instructions in the new repository's README.

---

Get help: [Post in our discussion board](https://github.com/orgs/skills/discussions/categories/resolve-merge-conflicts) • [Review the GitHub status page](https://www.githubstatus.com/)