From 4c8796250bcebf3eaee0e48b13e230b8f17e54ea Mon Sep 17 00:00:00 2001 From: Glowbal Date: Sat, 16 May 2015 20:14:12 +0200 Subject: [PATCH] "the release branch" instead of a release branch. There is only one. --- documentation/development/branching-and-release.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/development/branching-and-release.md b/documentation/development/branching-and-release.md index e154dcedce..f97980672c 100644 --- a/documentation/development/branching-and-release.md +++ b/documentation/development/branching-and-release.md @@ -20,7 +20,7 @@ Because this modification is for Arma and backwards compatability is not always ## 2 Branching and releases -We have a release scheduled every 2 weeks on a Tuesday. On the friday before release, the project management will decide whatever or not this scheduled release will continue. When continueing with the release, the current `master branch` will be merged into a `release branch`. This release branch will not contain any direct commits and no other branches will be merged into this branch. The exception being `hotfixes`, which are branched off `Release` and merged back into `Release` and `Master`. +We have a release scheduled every 2 weeks on a Tuesday. On the friday before release, the project management will decide whatever or not this scheduled release will continue. When continueing with the release, the current `master branch` will be merged into the `release branch`. The release branch will not contain any direct commits and no other branches will be merged into this branch. The exception being `hotfixes`, which are branched off `Release` and merged back into `Release` and `Master`. `Hotfixes` are fixes for critical bugs that prevent stable gameplay with the currently available version of ACE3.