diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a4cc8b8b6..15056933e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,7 +1,8 @@
 ## Pull Requests
 
 All changes, no matter how trivial, must be done via pull request. Commits
-should never be made directly on the `master` branch.
+should never be made directly on the `master` branch. Prefer rebasing over
+merging `master` into your PR branch to update it and resolve conflicts.
 
 _If you have commit access to SwiftLint and believe your change to be trivial
 and not worth waiting for review, you may open a pull request and merge