jprdonnelly/docs
1
0
Fork 0
mirror of synced 2025-12-23 11:54:18 -05:00
Code Issues Projects Releases Wiki Activity

Exemplify good commit message hygiene (#30850)

Browse Source
This commit is contained in:
Sean Allred
2024-01-02 04:08:18 -06:00
committed by GitHub
parent ab9d8ba8bf
commit 201a1c0450
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,7 +80,7 @@ For example, if you and another person both edited the file _styleguide.md_ on t
1. Commit your changes with a comment. 1. Commit your changes with a comment.
```shell ```shell
git commit -m "Resolved merge conflict by incorporating both suggestions." git commit -m "Resolve merge conflict by incorporating both suggestions"
``` ```
You can now merge the branches on the command line or [push your changes to your remote repository](/get-started/using-git/pushing-commits-to-a-remote-repository) on {% data variables.product.product_name %} and [merge your changes](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request) in a pull request. You can now merge the branches on the command line or [push your changes to your remote repository](/get-started/using-git/pushing-commits-to-a-remote-repository) on {% data variables.product.product_name %} and [merge your changes](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request) in a pull request.
@@ -137,7 +137,7 @@ For example, if you edited a file, such as _README.md_, and another person remov
1. Commit your changes with a comment. 1. Commit your changes with a comment.
```shell ```shell
$ git commit -m "Resolved merge conflict by keeping README.md file." $ git commit -m "Resolve merge conflict by keeping README.md file"
> [branch-d 6f89e49] Merge branch 'branch-c' into branch-d > [branch-d 6f89e49] Merge branch 'branch-c' into branch-d
``` ```