I know you rarely use the "Merge pull request" button in GitHub, and I see you use Tower.
- What do you do to keep your commit history so clean?
- Is this roughly correct?
-
Fetch the PR branch locally:
git fetch origin pull/ID/head:pr/ID -
If PR contains N commits, squash them into one:
git checkout pr/ID
git rebase -i HEAD~N -
Cherry pick the squashed PR commit into master:
git checkout master
git cherry-pick -e pr/ID -
Prepend "Close #ID PR: " to the commit message and complete the cherry pick
-
Run tests and push master
-
- Do you use a tool (e.g. Tower, apply-pr, or one of your own modules) to make this process easy?
sindresorhus / ama
[[I'm slow at replying these days, but I hope to get back to answering questions eventually]] Ask me anything!
142
How does funding with Polar work?
1
Pay now to fund the work behind this issue.
2
Get updates on progress being made.
3
Maintainer is rewarded once the issue is completed.
FAQ
Backer
You're funding impactful open source efforts
Contributor
You want to contribute to this effort
Maintainer
You want to get funding like this too