|
|
@@ -27,13 +27,13 @@ base_requirements.txt contrib docs mkdocs.yml NOTICE requ
|
|
|
CHANGELOG.md CONTRIBUTING.md LICENSE.txt netbox README.md scripts
|
|
|
```
|
|
|
|
|
|
-The NetBox project utilizes three long-term branches:
|
|
|
+The NetBox project utilizes three persistent git branches to track work:
|
|
|
|
|
|
* `master` - Serves as a snapshot of the current stable release
|
|
|
* `develop` - All development on the upcoming stable release occurs here
|
|
|
-* `develop-x.y` - Tracks work on an upcoming major release
|
|
|
+* `feature` - Tracks work on an upcoming major release
|
|
|
|
|
|
-Typically, you'll base pull requests off of the `develop` branch, or off of `develop-x.y` if you're working on a new major release. **Never** base pull requests off of the master branch, which receives merged only from the `develop` branch.
|
|
|
+Typically, you'll base pull requests off of the `develop` branch, or off of `feature` if you're working on a new major release. **Never** merge pull requests into the `master` branch, which receives merged only from the `develop` branch.
|
|
|
|
|
|
### Enable Pre-Commit Hooks
|
|
|
|