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

Update squash_and_merge_summary.md #36457

Merged
merged 2 commits into from
Feb 25, 2025
Merged

Update squash_and_merge_summary.md #36457

merged 2 commits into from
Feb 25, 2025

Conversation

mdmower-csnw
Copy link
Contributor

@mdmower-csnw mdmower-csnw commented Feb 24, 2025

Revise terminology from "original" change to "consolidated" changes to better describe what gets committed when squashing commits.

Why:

The final sentence of the squash and merge summary confusingly describes squashing commits as retaining "original" changes. That isn't accurate. Consolidated changes are kept from squashing commits.

Closes: #36456

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

Only the final sentence of the reusable squash-and-merge-summary snippet is updated.

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.

Revise terminology from "original" change to "consolidated" changes to better describe what gets committed when squashing commits.
Copy link

welcome bot commented Feb 24, 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 Feb 24, 2025
Copy link
Contributor

github-actions bot commented Feb 24, 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/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges.md fpt
ghec
ghes@ 3.15 3.14 3.13 3.12 3.11
fpt
ghec
ghes@ 3.15 3.14 3.13 3.12 3.11
from reusable
repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/about-merge-methods-on-github.md fpt
ghec
ghes@ 3.15 3.14 3.13 3.12 3.11
fpt
ghec
ghes@ 3.15 3.14 3.13 3.12 3.11
from reusable

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

🤖 This comment is automatically generated.

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.

Hi @mdmower-csnw and many thanks for raising a PR and linking it to an issue — I agree that the original text is confusing, but I've suggested a different improvement which is less tied to the original text. Many thanks for your interest in the GitHub docs!

@subatoi subatoi added content This issue or pull request belongs to the Docs Content team and removed triage Do not begin working on this issue until triaged by the team labels Feb 24, 2025
hellbilly13source

This comment was marked as spam.

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 again @mdmower-csnw! We really appreciate you taking the time to open an issue as well. I'll get this merged now.

Thanks again for your interest in the Docs!

@subatoi subatoi added this pull request to the merge queue Feb 25, 2025
Merged via the queue into github:main with commit 280602f Feb 25, 2025
43 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

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Revise squash and merge summary to indicate consolidated changes, not original changes are retained
3 participants