Skip to content

Commit 7b6a7d6

Browse files
committed
Add tip re. not needlessly rebasing
Helps minimise review burden.
1 parent ef41193 commit 7b6a7d6

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

contributing.adoc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,11 @@ When writing commit messages be sure to have read Chris Beams' "How to Write a G
2727
As described in CONTRIBUTING.md, PRs should be prefixed with the component or area the PR affects.
2828
Common areas are listed in CONTRIBUTING.md section: https://github.com/bitcoin/bitcoin/tree/master/CONTRIBUTING.md#creating-the-pull-request[Creating the pull request^].
2929
Individual commit messages are also often given similar prefixes in the commit title depending on which area of the codebase the changes primarily affect.
30+
31+
[TIP]
32+
====
33+
Unless there is a merge conflict (usually detected by DrahtBot), don't rebase your changes on master branch before pushing.
34+
If you avoid rebases on upstream, Github will show a very useful "Compare" button which reviewers can often use to quickly re-ACK the new changes if they are sufficiently small.
35+
If you _do_ rebase this button becomes useless, as all the rebased changes from master get included and so a full re-review may be needed.
36+
Developer review time is currently our major bottleneck in the project!
37+
====

0 commit comments

Comments
 (0)