Content in Merging PRs is incorrect

[Winson-Huang]

Code of Conduct

• I have read and agree to the GitHub Docs project's Code of Conduct

What article on docs.github.com is affected?

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request

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

What part(s) of the article would you like to see updated?

In the section "About pull request merges", content says:

Pull requests are merged using the --no-ff option, except for pull requests with squashed or rebased commits, which are merged using the fast-forward option.

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. The content aforementioned should be:

Pull requests are merged using the --no-ff option, except for pull requests with squashed commits, which are merged using the fast-forward option.

Additional information

No response

[welcome]

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

[cmwilson21]

@Winson-Huang Thank you for opening an issue and linking it to your PR! ✨

[Pnythail]

Code of Conduct

• I have read and agree to the GitHub Docs project's Code of Conduct

What article on docs.github.com is affected?

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request

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

What part(s) of the article would you like to see updated?

In the section "About pull request merges", content says:

Pull requests are merged using the --no-ff option, except for pull requests with squashed or rebased commits, which are merged using the fast-forward option.

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. The content aforementioned should be:

Pull requests are merged using the --no-ff option, except for pull requests with squashed commits, which are merged using the fast-forward option.

Additional information

No response

[Pnythail]

@Pnythail

[sophietheking]

Hi @Winson-Huang 👋 Thanks for creating an issue 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 issue. 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]

I think there may be some misunderstanding here. Firstly I'd like to make sure we all agree that "rebase and merge" DOES NOT use fast-forward, right? (It just resembles a fast-forward)

Then, in PR #26547 I just want to fix the inconsistency between this fact and contents below:

Pull requests are merged using the --no-ff option, except for pull requests with squashed or rebased commits, which are merged using the fast-forward option.

which are located this page in docs.

Please don't mix up "About pull request merges" section in this page and another independent About pull request merges page.

May be there is a better fix, but I think the inconsistency in docs definitely exists, shouldn't be ignored.

[Winson-Huang]

Maybe this issue need reopen...