Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Consistently make use of the dot #6888

Merged
merged 1 commit into from
Mar 23, 2019
Merged

Consistently make use of the dot #6888

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/wiki/development/branching-and-release.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ During this release process between the Friday and Tuesday, the day of release,
### 3.1 Branching

* New features, bug fixes that are not a hotfix or other work will always be branched off `master` or another branch but never a `hotfix` or the `release` branch.
* Hotfixes are always branched off the `release` branch
* Hotfixes are always branched off the `release` branch.
* The `release` branch is never merged or deleted. Only `master` or hotfixes are allowed to merge into the `release` branch.

### 3.2 Diagram
Expand Down