File tree Expand file tree Collapse file tree 1 file changed +1
-1
lines changed Expand file tree Collapse file tree 1 file changed +1
-1
lines changed Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ changes are made.
33
33
Note that the ` MAJOR.MINOR-patched ` branch of that fork is maintained in the format
34
34
of a * patch tree* , which is a branch that consists of an entirely linear sequence of
35
35
commits applied on top of another branch (in the case of the fork, ` MAJOR.MINOR ` ),
36
- each of which adding a new feature. Therefore, a bug fix for an existing commit
36
+ each of which adds a significant new feature. Therefore, a bug fix for an existing commit
37
37
in the patch tree * will* be merged when appropriate, but its changes will get combined
38
38
with that existing commit that adds the feature. A feature addition PR will be squashed
39
39
into a single, new commit, and then put on top of the patch tree.
You can’t perform that action at this time.
0 commit comments