Skip to content

Update merging-a-pull-request.md and fix #26546 #26547

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.

Sign up for GitHub

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

Closed
wants to merge 3 commits into from
Closed

Update merging-a-pull-request.md and fix #26546 #26547

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26ff243
Update merging-a-pull-request.md and fix #26546
Winson-Huang Jul 8, 2023
6cfecd1
Merge pull request #1 from Winson-Huang/main
Winson-Huang Jul 10, 2023
5588324
Merge branch 'main' into fix#26546
Winson-Huang Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ll-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down