Exemplify good commit message hygiene (github#30850)

ebfork · Jan 2, 2024 · 201a1c0 · 201a1c0
1 parent ab9d8ba
commit 201a1c0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line.md b/...addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line.md
@@ -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.
 
    ```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.
@@ -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.
 
    ```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
    ```