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 merging-a-pull-request.md and fix #26546 #26547

Closed
wants to merge 3 commits into from

Conversation

Winson-Huang
Copy link

Why:

Closes: #26546

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

https://github.com/github/docs/blob/main/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request.md

Check off the following:

  • I have reviewed my changes in staging, available via the View deployment link in this PR's timeline.

    • For content changes, you will also see an automatically generated comment with links directly to pages you've modified. The comment won't appear if your PR only edits files in the data directory.
  • For content changes, I have completed the self-review checklist.

@welcome
Copy link

welcome bot commented Jul 8, 2023

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 Jul 8, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Jul 8, 2023

Automatically generated comment ℹ️

This comment is automatically generated and will be overwritten every time changes are committed to this branch.

The table contains an overview of files in the content directory that have been changed in this pull request. It's provided to make it easy to review your changes on the staging site. Please note that changes to the data directory will not show up in this table.


Content directory changes

You may find it useful to copy this table into the pull request summary. There you can edit it to share links to important articles or changes and to give a high-level overview of how the changes in your pull request support the overall goals of the pull request.

Source Preview Production What Changed
pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request.md fpt
ghec
ghes@ 3.9 3.8 3.7 3.6 3.5
ghae
fpt
ghec
ghes@ 3.9 3.8 3.7 3.6 3.5
ghae

fpt: Free, Pro, Team
ghec: GitHub Enterprise Cloud
ghes: GitHub Enterprise Server
ghae: GitHub AE

@cmwilson21
Copy link
Contributor

@Winson-Huang Thank you for opening a PR and linking it to your issue! We appreciate all the extra context provided in the issue ✨

And welcome to the community! I'll get this triaged for review! ⚡

In the meantime, if you'd like to find other ways to contribute, check out our help wanted section to find open issues you can work on. 👍

@cmwilson21 cmwilson21 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 pull requests Content related to pull requests and removed triage Do not begin working on this issue until triaged by the team labels Jul 10, 2023
@Winson-Huang
Copy link
Author

Thanks for your response, I'd like someone to review this PR

@sophietheking sophietheking added the needs SME This proposal needs review from a subject matter expert label Jul 17, 2023
@github-actions
Copy link
Contributor

Thanks for opening a pull request! We've triaged this issue for technical review by a subject matter expert 👀

@sophietheking
Copy link
Contributor

Hi @Winson-Huang 👋 Thanks for creating a PR and contributing to our docs, we really appreciate it! ✨ However, after careful consideration, we've found that your suggested change is not needed at the moment because the docs are accurate.

In the issue you raised, you mentioned:

However, as about-pull-request-merges says, and as issue #1387 and PR #11373 mentioned, PRs with rebased commits are NOT merged with fast-forward.

While we value your input, we must clarify that our existing documentation covers this scenario. The "Rebase and merge your commits" section says:

When you select the Rebase and merge option on a pull request on GitHub.com, all commits from the topic branch (or head branch) are added onto the base branch individually without a merge commit. In that way, the rebase and merge behavior resembles a fast-forward merge

Since we have the information correctly represented, we have decided to close this PR. Nevertheless, we really appreciate you contributing to the community, and we encourage you to continue contributing in the future! 💖 Keep up the fantastic work! 🌟

@Winson-Huang
Copy link
Author

Please see my response in initial issue#26546, and consider reopen this PR if needed, thanks.

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 needs SME This proposal needs review from a subject matter expert pull requests Content related to pull requests waiting for review Issue/PR is waiting for a writer's review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Content in Merging PRs is incorrect
3 participants