diff --git a/006-git-commit-messages.md b/006-git-commit-messages.md
deleted file mode 100644
index ba1b2c4..0000000
--- a/006-git-commit-messages.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# 006 - Git commit messages
-
-
-## Subject line
-
-- Use `#123` to reference issue by number
-- Use imperative mood that's `Fix`, not `Fixed`
-- Don't add period at the end
-- Use `[skip ci]` if there is no need to run unit tests
-- Start with a capital letter
-- Limit to 50 characters
-
-## Body
-
-Use message body **if** you need an extra explanation. Explain why, not how.
-
-- Limit line length to 72 characters
diff --git a/006-git.md b/006-git.md
new file mode 100644
index 0000000..af4a804
--- /dev/null
+++ b/006-git.md
@@ -0,0 +1,25 @@
+# 006 - Git
+
+## Branch workflow
+
+- Create a dedicated branch for each feature. Develop each version in specific branches.
+- Before the first release, main branch is `master`.
+- After the first release, create a new release branch `1.x` and make it main branch.
+- Major changes must be made in `master` branch.
+
+## Commit messages
+
+### Subject line
+
+- Use `#123` to reference issue by number
+- Use imperative mood that's `Fix`, not `Fixed`
+- Don't add period at the end
+- Use `[skip ci]` if there is no need to run unit tests
+- Start with a capital letter
+- Limit to 50 characters
+
+### Body
+
+Use message body **if** you need an extra explanation. Explain why, not how.
+
+- Limit line length to 72 characters
diff --git a/README.md b/README.md
index 9ad298e..5e736a7 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@
 - [003 - Roadmap](003-roadmap.md)
 - [004 - Namespaces](004-namespaces.md)
 - [005 - Development tool](005-development-tool.md)
-- [006 - Git commit messages](006-git-commit-messages.md)
+- [006 - Git](006-git.md)
 - [007 - Exceptions](007-exceptions.md)
 - [008 - Interfaces](008-interfaces.md)
 - [009 - Design decisions](009-design-decisions.md)