-
-
Notifications
You must be signed in to change notification settings - Fork 800
Splitting (Breaking down) Pull Requests
Maxim Belkin edited this page Oct 16, 2018
·
6 revisions
Sometimes maintainers will ask you to break your Pull Request (PR) into smaller ones. To do that, please follow the steps outlined below.
- Do a soft-reset to the beginning of the branch you used for submitting the original Pull Request (
your-PR-branch
):
git reset --soft $(git merge-base gh-pages your-PR-branch)
- Create a new branch for a (smaller) pull request:
git checkout -b new-branch1 gh-pages
-
(Optional | Advanced) If you need to unstage some of the changes from the files you modified, do so with
reset -p
. If you need to stage (add to the "Staging area") some of the changes, do so withadd -p
git reset -p HEAD some-file.ext
# or
git add -p some-other-file.ext
- Commit a subset of files for a (smaller) pull request:
git commit -m "Message" some-file.ext some-other-file-if-needed.ext
- Repeat steps 2 through 4 using different branch names and files.