-
Notifications
You must be signed in to change notification settings - Fork 61.9k
Docs(merge_strategies): Clarfiy rebase and ff merge similarity #11373
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
Conversation
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. |
@devtayls |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @devtayls, this looks great! I'm applying a suggestion with a few small style tweaks and will merge after CI finishes! ⚡
The link check errors are unrelated to this PR. |
Thanks very much for contributing! Your pull request has been merged 🎉 You should see your changes appear on the site in approximately 24 hours. If you're looking for your next contribution, check out our help wanted issues ⚡ |
Why:
Closes 1387
What's being changed:
Content Changes
to:
This is because as @bk2204, @spikyjt explained in the issue, rebasing looks like
ff-merge
, but in actuality is a destructive method which changes the project history.Refactor
Move paragraph on enabling Rebase and Merge behind paragraph explaining how rebasing works on Github. This flows better as: 'What is rebase and merge?' -> 'How do I enable Rebase and Merge?' Than the previous version which was: 'What is rebase and merge?' -> 'How do I enable Rebase and Merge' -> 'How github rebase differs from git rebase'
Check off the following:
Writer impact (This section is for GitHub staff members only):