![]() ![]() If you click Rebase and merge, all commits will be made "with" you, the original PRs will link to your PR, and GitHub will display This branch is X commits ahead, Y commits behind.This is most often something you don't want. If you click the dropdown and choose "Squash and merge", all intervening commits will be squashed into one.The default will create an ugly merge commit.Now you have three options, but each will lead to a less-than-clean commit history. Scroll down to Merge pull request, but don't click anything yet.Create pull request and assign a predictable name to your pull request (e.g., Update from original). ![]() Now GitHub will compare your fork with the original, and you should see all the latest changes. Otherwise, manually set the base fork drop down to your fork, and the head fork to the upstream.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |