Skip to content

Commit

Permalink
Changed to backticks to format references to the file names (instead …
Browse files Browse the repository at this point in the history
…of italics)
  • Loading branch information
lalithaar authored Dec 18, 2024
1 parent 9ab9d1c commit b91542d
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ You can now merge the branches on the command line or [push your changes to your
To resolve a merge conflict caused by competing changes to a file, where a person deletes a file in one branch and another person edits the same file, you must choose whether to delete or keep the removed file in a new commit.
For example, if you edited a file, such as _README.md_, and another person removed the same file in another branch in 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 edited a file, such as (`README.md`), and another person removed the same file in another branch in 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 All @@ -94,7 +94,7 @@ For example, if you edited a file, such as _README.md_, and another person remov
cd REPOSITORY-NAME
```

1. Generate a list of the files affected by the merge conflict. In this example, the file _README.md_ has a merge conflict.
1. Generate a list of the files affected by the merge conflict. In this example, the file (`README.md`) has a merge conflict.

```shell
$ git status
Expand Down

0 comments on commit b91542d

Please sign in to comment.