Skip to content

Commit a7ae08c

Browse files
Use backticks to format file reference (#35469)
Co-authored-by: Alex Nguyen <[email protected]>
1 parent 4dee48a commit a7ae08c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Merge conflicts occur when competing changes are made to the same line of a file
2424

2525
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.
2626

27-
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.
27+
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.
2828

2929
{% data reusables.command_line.open_the_multi_os_terminal %}
3030
1. Navigate into the local Git repository that has the merge conflict.

0 commit comments

Comments
 (0)