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

Merge pull request #53408 from github/repo-sync

Browse Source 
Repo sync
This commit is contained in:
docs-bot
2024-12-02 08:39:47 -08:00
committed by GitHub
parent c53a70ecc8 9df207d646
commit c78f2db3c5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
content/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line.md
View File

@@ -24,7 +24,7 @@ Merge conflicts occur when competing changes are made to the same line of a file
To resolve a merge conflict caused by competing line changes, you must choose which changes to incorporate from the different branches in a new commit. To resolve a merge conflict caused by competing line changes, you must choose which changes to incorporate from the different branches in a new commit.
For example, if you and another person both edited the file _styleguide.md_ on the same lines in different branches of the same Git repository, you'll get a merge conflict error when you try to merge these branches. You must resolve this merge conflict with a new commit before you can merge these branches. For example, if you and another person both edited the file `styleguide.md` on the same lines in different branches of the same Git repository, you'll get a merge conflict error when you try to merge these branches. You must resolve this merge conflict with a new commit before you can merge these branches.
{% data reusables.command_line.open_the_multi_os_terminal %} {% data reusables.command_line.open_the_multi_os_terminal %}
1. Navigate into the local Git repository that has the merge conflict. 1. Navigate into the local Git repository that has the merge conflict.