jprdonnelly/docs
1
0
Fork 0
mirror of synced 2025-12-19 18:10:59 -05:00
Code Issues Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Kevin Heis
2023-09-25 10:37:44 -07:00
parent 7e18a93662
commit 335f3c22cb
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
content/contributing/collaborating-on-github-docs/using-git-on-github-docs.md
View File

@@ -153,7 +153,11 @@ There are two ways to handle merge conflicts:
1. In the file, look for the merge conflict markers.
```text
Here are the changes from the main branch.
<<<<<<< HEAD
Here are the changes you've made.
=====================
Here are the changes from the main branch.
>>>>>>> main
```
1. Decide which changes to keep and delete the unwanted changes and the merge conflict markers. If you need to make further changes, you can do so at the same time. For example, you could change the five lines shown in the previous code sample to the single line: