opus-tango/skills-resolve-merge-conflicts
1
0
Fork 0
mirror of https://github.com/opus-tango/skills-resolve-merge-conflicts.git synced 2026-03-20 03:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to 3 in STEP and README.md

Browse Source
This commit is contained in:
github-actions
2023-09-12 18:45:19 +00:00
parent 8efe2e721c
commit d118ba6e24
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/steps/-step.txt vendored
View File

@@ -1 +1 @@
2 3

32
README.md
View File

@@ -14,31 +14,29 @@ _Learn why conflicts happen and how to resolve them._
</header> </header>
<!-- <!--
<<< Author notes: Step 2 >>> <<< Author notes: Step 3 >>>
Start this step by acknowledging the previous step. Start this step by acknowledging the previous step.
Define terms and link to docs.github.com. Define terms and link to docs.github.com.
--> -->
## Step 2: Resolve a merge conflict ## Step 3: Create your own conflict
_Good start! Now let's look deeper at a merge conflict! :mag:_ _Good job! You've solved a merge conflict! :tada:_
This can be intimidating, but have no fear, Git is smart when it comes to merging! Git only needs a human to decide how to [resolve the conflict](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line). Sometimes, the best way to resolve a merge conflict is to add content that's from both branches, or even something that isn't on either! This is why Git needs a human to look at the code and make the proper fixes. 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`.
### :keyboard: Activity: Resolve a merge conflict Now, let's get a little evil. (It's for educational purposes!)
1. Open the pull request that you just created, we created a conflict for you. Have no fear! ### :keyboard: Activity: Create your own conflict
1. At the bottom of the page, under "This branch has conflicts that must be resolved", click the **Resolve conflicts** button.
1. Look for the highlighted sections that begins with `<<<<<<< my-resume` and ends with `>>>>>>> main`. These markers are added by Git to show you the content that is in conflict. We went ahead and added a new file called `references.md` and pushed that change to `main`, without updating your `my-resume` branch.
1. Remove the changes made on the main branch by deleting all of the content below the `=======` and above `>>>>>>> main`.
1. Next, remove the merge conflict markers by deleting the following lines: 1. Browse to the `my-resume` branch.
``` 1. Click the `Add file` dropdown menu and then on `Create new file`.
<<<<<<< my-resume 1. Create a file named `references.md`.
======= 1. Enter some text that conflicts with what we added for `references.md` in the `main` branch.
>>>>>>> main 1. Scroll to the bottom of the page and enter a commit message for your change.
``` 1. Click the **Commit new file** button, making sure the "Commit directly to the `my-resume` branch" option is selected.
1. With the merge conflict markers removed, click **Mark as resolved**.
1. Finally, click **Commit merge**.
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. 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.
<footer> <footer>