From 26ff243b37f6e2aaa27efc5a6cb3dd6d2cd5fdad Mon Sep 17 00:00:00 2001 From: Winson Huang Date: Sun, 9 Jul 2023 01:29:23 +0800 Subject: [PATCH] Update merging-a-pull-request.md and fix #26546 --- .../merging-a-pull-request.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request.md b/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request.md index 5aec538d67c0..1f20cbe974fc 100644 --- a/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request.md +++ b/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request.md @@ -33,7 +33,7 @@ For more information, see "[AUTOTITLE](/pull-requests/collaborating-with-pull-re {% endnote %} -Pull requests are merged using [the `--no-ff` option](https://git-scm.com/docs/git-merge#_fast_forward_merge), except for [pull requests with squashed or rebased commits](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges), which are merged using the fast-forward option. +Pull requests are merged using [the `--no-ff` option](https://git-scm.com/docs/git-merge#_fast_forward_merge), except for [pull requests with squashed commits](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges), which are merged using the fast-forward option. {% data reusables.pull_requests.close-issues-using-keywords %}