Guidelines for better pull requests
August 12, 2020 • 0 minute read
During my work to align our development efforts at Leo Innovation Lab I stumbled upon 10 tips for better Pull Requests by Mark Seemann (2015). The blog post aligned well with our perception of a good pull request (PR) and was a great starting point for discussions.
Below is my iteration of the original post. This is a condensed version with a focus on automation, tooling, context, and my personal learnings.
The goal of these guidelines is to make the pull request review process easier and will likely:
- improve the feedback you get on your work
- reduce the risk that your pull request will be rejected or become stale
- elevate overall the quality of the code and product.
Do only one thing
The more concerns you address in a single Pull Request, the bigger the risk that at least one of them will block acceptance of your contribution. Do only one thing per Pull Request. It also helps you make each Pull Request smaller.
– Mark Seemann
If you often clutter PRs with multiple concerns then ask yourself why. Maybe your CI setup is slow? Maybe merging is cumbersome? In any case, start by fixing the underlying problems to enable you to do only one thing and make your PRs small.
What is a small PR? A good rule of thumb is maximum a few days of work, preferably less. This also gives a great sense of progress. And usually you can break work up into smaller daily deliverables.
Short-lived feature branches
Avoid any long-lived feature branches. Getting your changes into the main branch as quickly as possible is often the most productive. It might require that you invest in setting up a system for supporting feature toggles.
Set up proper tooling
A reviewer should not spend any time nitpicking over style, ensuring that tests pass or figuring out if the code coverage dropped. Instead you should invest in tooling and automate any verification steps. Block any merging until your CI server is happy and let your reviewers focus on more interesting topics than nitpicking over line width or spinning up the project on their local machine.
Add appropriate context in the PR
Adding context for the suggested change is important for the review process. This also serves for future reference when someone is trying to understand why a change was made.
Include the following in your PR description:
- link to bug ticket or issue (if a link is missing this is usually an indicator that the work is not planned)
- a description of the suggested change
- relevant design considerations and alternative solutions considered
- checklist with TODOs if the pull request is a draft
- if the change can be represented visually, then add a screenshots/gif/video showing how the state before and after the change. Note that this also applies for a backend change (e.g. diff the GraphQL endpoint, show a database optimization using
I recommend using a pull request template to guide and ensuring that the relevant fields are filled out.
Document your code
Strive for self-documenting code (e.g. using clear and consistent naming, types and function signatures). But if you need to explain the code logic in the PR description, then it probably calls for better code comments.
Code comments should document the why, not the how. Commit messages is also a great place for additional context.
Use correct spelling, grammar, and punctuation in code, code comments, commit messages, and pull requests. If you don’t, your prose (and code) is harder to understand for the reviewers and future maintainers. Note that most code editors can be configured to help you with these concerns.
Avoid commit thrashing
When a PR is in review, please avoid rewriting the history on the branch (e.g. amending, squashing, or rebasing in general) and address any review comments in new commits.
If you need to update the branch then avoid trashing the commit history with
Merge branch 'master' into MY-BRANCH commits. This can be done by using rebase instead of merging (e.g.
git pull --rebase origin master if you are using git).