Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use backticks to format file reference #35469

Merged
merged 2 commits into from
Dec 2, 2024
Merged

Use backticks to format file reference #35469

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30d7a78
Use backticks to format file reference
annegentle Nov 28, 2024
d174c25
Merge branch 'main' into annegentle/backticks-35456
nguyenalex836 Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

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 %}
1. Navigate into the local Git repository that has the merge conflict.
Expand Down
Loading