Ecosyste.ms: Awesome

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

Awesome Lists | Featured Topics | Projects

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

My clone repository
https://github.com/friendbear/skills-resolve-merge-conflicts

Last synced: about 1 month ago
JSON representation

My clone repository

Host: GitHub
URL: https://github.com/friendbear/skills-resolve-merge-conflicts
Owner: friendbear
License: mit
Created: 2024-06-20T02:15:01.000Z (6 months ago)
Default Branch: main
Last Pushed: 2024-06-20T02:15:28.000Z (6 months ago)
Last Synced: 2024-06-20T14:41:03.276Z (6 months ago)
Size: 6.84 KB
Stars: 0
Watchers: 1
Forks: 0
Open Issues: 0
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._

## Step 1: Create a pull request

_Welcome to "Managing Merge Conflicts"! :wave:_

**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 so let's start by creating one.

### :keyboard: Activity: Create a pull request

1. Open a new browser tab, and work on the steps in your second tab while you read the instructions in this tab.
1. We made a small change to a file in the repository in the `my-resume` branch.
1. [Create a pull request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request) setting `my-resume` as the head branch and `main` as the base branch. You can enter `Resolving merge conflicts` for the pull request title and body.
1. Wait about 20 seconds then refresh this page (the one you're following instructions from). [GitHub Actions](https://docs.github.com/en/actions) will automatically update to the next step.

---

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/)