Skip to content

Commit d3268d5

Browse files
authored
Update example commit message (#56372)
1 parent 0fc8ad9 commit d3268d5

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

content/contributing/collaborating-on-github-docs/using-git-on-github-docs.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ To keep your local branches in sync with their remotes and avoid merge conflicts
131131
> [!NOTE]
132132
> We generally don't close an issue via a commit. To close an issue, open a pull request and add "Closes #1234" to the description. The linked issue will be closed when the pull request is merged. For more information, see [AUTOTITLE](/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
133133
134-
* Make commit messages clear, detailed, and imperative. For example: "Adds a conceptual article about 2FA," not "Add info."
134+
* Make commit messages clear, detailed, and imperative. For example: "Add conceptual article about 2FA," not "Add info."
135135
* Try not to leave uncommitted changes in your local branch when you finish working for the day. Get to a good stopping point and commit and push your changes so your work is backed up to the remote repository.
136136
* Only push up to {% data variables.product.prodname_dotcom %} after you've made a few commits. Pushing after every commit adds noise to our ops channels on Slack and causes unnecessary builds to run.
137137

@@ -140,6 +140,7 @@ To keep your local branches in sync with their remotes and avoid merge conflicts
140140
When you try to merge two branches that contain different changes to the same part of a file, you will get a merge conflict. In our workflow, this most often occurs when merging `main` down into a local topic branch.
141141

142142
There are two ways to handle merge conflicts:
143+
143144
* Edit the file in your text editor and choose which changes to keep. Then commit the updated file to your topic branch from the command line.
144145
* [AUTOTITLE](/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github).
145146

0 commit comments

Comments
 (0)