Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clarify blank lines requirement for Co-authored-by #36811

Merged
merged 2 commits into from
Mar 14, 2025

Conversation

emdash-ie
Copy link
Contributor

@emdash-ie emdash-ie commented Mar 13, 2025

Why:

At the moment, these docs suggests that two blank lines are needed before the Co-authored-by trailers for github to recognise the declared co-authors. This is (now?) incorrect, as can be seen in this commit, which only leaves one blank line but does display the two co-authors in the UI.

Closes: #36812

What's being changed (if available, include any code snippets, screenshots, or gifs):

This commit updates the docs to make it clearer that only one blank line is required.

I’ve also added the missing leading > symbols before the trailers when writing the message in the shell (they’re added by bash and possibly others to indicate it’s a continuation line).

Check off the following:

  • A subject matter expert (SME) has reviewed the technical accuracy of the content in this PR. In most cases, the author can be the SME. Open source contributions may require an SME review from GitHub staff.
  • The changes in this PR meet the docs fundamentals that are required for all content.
  • All CI checks are passing and the changes look good in the review environment.

At the moment, these docs suggests that two blank lines are needed
before the Co-authored-by trailers for github to recognise the declared
co-authors. This is (now?) incorrect, as can be seen in [this
commit](guardian/amigo@84df334),
which only leaves one blank line but does display the two co-authors in
the UI.

This commit updates the docs to make it clearer that only one blank line
is required. (I have been using `git commit --cleanup=verbatim`
completely unnecessarily!)

I’ve also added the missing leading `>` symbols before the trailers when
writing the message in the shell (they’re added by bash and possibly
others to indicate it’s a continuation line).
Copy link

welcome bot commented Mar 13, 2025

Thanks for opening this pull request! A GitHub docs team member should be by to give feedback soon. In the meantime, please check out the contributing guidelines.

@github-actions github-actions bot added the triage Do not begin working on this issue until triaged by the team label Mar 13, 2025
Copy link
Contributor

github-actions bot commented Mar 13, 2025

How to review these changes 👓

Thank you for your contribution. To review these changes, choose one of the following options:

A Hubber will need to deploy your changes internally to review.

Table of review links

⚠️ Warning: Our review server is experiencing latency issues.

The table shows the files in the content directory that were changed in this pull request. This helps you review your changes on the review server. Changes to the data directory are not included in this table.

Source Review Production What Changed
pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors.md fpt
ghec
ghes@ 3.16 3.15 3.14 3.13 3.12
fpt
ghec
ghes@ 3.16 3.15 3.14 3.13 3.12

Key: fpt: Free, Pro, Team; ghec: GitHub Enterprise Cloud; ghes: GitHub Enterprise Server

🤖 This comment is automatically generated.

@emdash-ie emdash-ie marked this pull request as ready for review March 13, 2025 16:14
@subatoi subatoi added content This issue or pull request belongs to the Docs Content team waiting for review Issue/PR is waiting for a writer's review and removed triage Do not begin working on this issue until triaged by the team labels Mar 13, 2025
@subatoi
Copy link
Contributor

subatoi commented Mar 13, 2025

Many thanks @emdash-ie, we'll review this as soon as we can

…ing-and-editing-commits/creating-a-commit-with-multiple-authors.md
Copy link
Contributor

@subatoi subatoi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @emdash-ie, this is a good addition and we appreciate you raising an issue and a PR to fix this! I just removed a Latin abbreviation as Microsoft Style doesn't like those, but other than that this is good to merge, so I'll get this in for you now ✨

@subatoi subatoi enabled auto-merge March 14, 2025 11:46
@subatoi subatoi added this pull request to the merge queue Mar 14, 2025
Merged via the queue into github:main with commit db0cf5d Mar 14, 2025
44 checks passed
Copy link
Contributor

Thanks very much for contributing! Your pull request has been merged 🎉 You should see your changes appear on the site in approximately 24 hours. If you're looking for your next contribution, check out our help wanted issues

@emdash-ie emdash-ie deleted the update-co-authored-by-instructions branch March 14, 2025 12:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
content This issue or pull request belongs to the Docs Content team waiting for review Issue/PR is waiting for a writer's review
Projects
None yet
2 participants