From 201a1c0450c607ef4f9998082cce73f22ec67f9c Mon Sep 17 00:00:00 2001 From: Sean Allred Date: Tue, 2 Jan 2024 04:08:18 -0600 Subject: [PATCH] Exemplify good commit message hygiene (#30850) --- .../resolving-a-merge-conflict-using-the-command-line.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line.md b/content/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line.md index 168880cdf91f..c84080b7b84e 100644 --- a/content/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line.md +++ b/content/pull-requests/collaborating-with-pull-requests/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 ```