-
Notifications
You must be signed in to change notification settings - Fork 60k
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
Description of rebase merge method is incorrect #1387
Comments
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. |
Hey, I've looked at what's going on here, and you're correct that the committer information is updated to reflect the person performing the merge. I'm not sure, but I think what might have been intended by this is that the branch is rebased by the person doing the merge and then merged into the base branch with I agree that things could be rephrased to be a little clearer here about the behavior. |
Can I be assigned this? |
…o 1.0.13 (github#1383)" (github#1387) This reverts commit 2fba873 to debug a link-checking problem.
What article on docs.github.com is affected?
https://docs.github.com/en/free-pro-team@latest/github/administering-a-repository/about-merge-methods-on-github
Contained in:
https://github.com/github/docs/blob/main/content/github/administering-a-repository/about-merge-methods-on-github.md
Which reads from:
https://github.com/github/docs/blob/main/data/reusables/pull_requests/rebase_and_merge_summary.md
What part(s) of the article would you like to see updated?
In the section
Rebasing and merging your commits
, the description saysHowever, this is not the case. Rebasing is actually done with the
--force
option as described later in the section where it clarifies that the commit hash and the committer will change. This is explicitly forced rebase behaviour and quite different from fast-forward, which leaves all commits as-is.Additional information
I consider this confusing, as someone looking for a fast-forward merge option might stop at the end of the intro, thinking they have found the option they need, but in fact will get different behaviour.
The text was updated successfully, but these errors were encountered: