Skip to content

Commit 61bda0f

Browse files
committed
develop -> development
1 parent f7ea361 commit 61bda0f

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Contributing.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ As the creators, and maintainers of this project, we want to ensure that the pro
44

55
#### Development Process
66

7-
We maintain two permanent, protected branches: `master` and `develop`.
7+
We maintain two permanent, protected branches: `master` and `development`.
88

99
`master` is for working on the current release, so any bug fixes or documentation spelling fixes should be merged into this branch.
1010

11-
`develop` is where we stage work for the *next* release, i.e. breaking API changes and related documentation updates. Contributors should gently encourage new pull-requests to point to the appropriate branch, and to rebase onto that branch if necessary.
11+
`development` is where we stage work for the *next* release, i.e. breaking API changes and related documentation updates. Contributors should gently encourage new pull-requests to point to the appropriate branch, and to rebase onto that branch if necessary.
1212

13-
When a new version is ready to be released, please create a pull request to merge `develop` into `master`, named something like "Release 10.0". Then we can have some final discussion before we merge it into `master` and push the release out to the public.
13+
When a new version is ready to be released, please create a pull request to merge `development` into `master`, named something like "Release 10.0". Then we can have some final discussion before we merge it into `master` and push the release out to the public.
1414

15-
Since `develop` is a *shared* branch, it is important not to ever rebase this branch onto `master`. If a bug fix is applied to `master` it can be merged into `develop` using good old simple `git checkout develop && git merge master`. Yes this will clutter the history a little bit, but it also provides important context to know how/when a patch was applied. Merge commits can be considered necessary historical data, not warts on an idealized history graph.
15+
Since `development` is a *shared* branch, it is important not to ever rebase this branch onto `master`. If a bug fix is applied to `master` it can be merged into `development` using good old simple `git checkout development && git merge master`. Yes this will clutter the history a little bit, but it also provides important context to know how/when a patch was applied. Merge commits can be considered necessary historical data, not warts on an idealized history graph.
1616

1717
#### Testing
1818

0 commit comments

Comments
 (0)