From 16b1bef16977ccffa09aba34b51c6bfa984d172b Mon Sep 17 00:00:00 2001 From: Shmavon Gazanchyan Date: Mon, 15 Sep 2014 18:05:39 +0100 Subject: [PATCH 1/2] Remove duplicate content Git instructions are already exist in readme.md file --- docs/en/dev/git.md | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 docs/en/dev/git.md diff --git a/docs/en/dev/git.md b/docs/en/dev/git.md deleted file mode 100644 index c9e656b..0000000 --- a/docs/en/dev/git.md +++ /dev/null @@ -1,5 +0,0 @@ -Git conversation -================ - -Ветка `master` содержит стабильную последнюю версию проекта. В ветку `master` может сливаться новая версия проекта из `develop` или исправления. -Ветка `develop`, для разработки, содержит не стабильную версию проекта. Принимает все новшевства, изменения и исправления. From 292bdd90b5e5c57fd84ac180153b6e971d8580f2 Mon Sep 17 00:00:00 2001 From: Shmavon Gazanchyan Date: Mon, 15 Sep 2014 18:06:05 +0100 Subject: [PATCH 2/2] Editorial changes for dev readme --- docs/en/dev/readme.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/docs/en/dev/readme.md b/docs/en/dev/readme.md index 4e96964..ef019b2 100644 --- a/docs/en/dev/readme.md +++ b/docs/en/dev/readme.md @@ -1,12 +1,15 @@ Develop ======= -If you want to discuss the enhancement of the Fenom, create an issue on Github or submit a pull request. +If you want to contribute to Fenom please feel free to create an issue or submit a pull request on Github. -There tho branches — master and develop. -The branch master for stable releases and hotfixes; the branch develop for development of features. Each tag names by rule `major.minor.fix` (1.4.9, 1.1.2 etc) and creates from master. Version changes by the rule of [semantic versioning](http://semver.org/). +There are two branches: + +* `master` branch is for stable releases and hotfixes +* `develop` branch is for development of features + +Each tag names by rule `major.minor.fix` (1.4.9, 1.1.2, etc.) and creates from master. Version changes by the rule of [semantic versioning](http://semver.org/). For questions: a.cobest@gmail.com (English, Russian languages) - -* the [scheme of work](schema.md) +* the [scheme of work](schema.md) \ No newline at end of file