From 2b71f528b91b0e2872614f864f6005cfbe42a692 Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Sat, 6 Jan 2024 13:52:49 +0300 Subject: [PATCH 1/4] Add "Branch workflow" --- 006-git-commit-messages.md | 17 ----------------- 006-git.md | 27 +++++++++++++++++++++++++++ README.md | 2 +- 3 files changed, 28 insertions(+), 18 deletions(-) delete mode 100644 006-git-commit-messages.md create mode 100644 006-git.md 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..6e572ac --- /dev/null +++ b/006-git.md @@ -0,0 +1,27 @@ +# 006 - Git + +## Branch workflow + +For each feature is used a dedicated branch. The development of each version is carried out in the specific branches. + +Before the first release, main branch is `master` only. + +After the first release, `master` branch must rename to `1.x`. For major change must be created a new branch with usage +next version as name (for example, `2.x`). The main branch is the branch with the current stable release. + +## 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) From 6cadf0ec898764616f0f07a42d47c2d6bbde0427 Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Sat, 6 Jan 2024 17:31:05 +0300 Subject: [PATCH 2/4] Update 006-git.md Co-authored-by: Alexander Makarov --- 006-git.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/006-git.md b/006-git.md index 6e572ac..5d2ccf0 100644 --- a/006-git.md +++ b/006-git.md @@ -2,12 +2,9 @@ ## Branch workflow -For each feature is used a dedicated branch. The development of each version is carried out in the specific branches. - -Before the first release, main branch is `master` only. - -After the first release, `master` branch must rename to `1.x`. For major change must be created a new branch with usage -next version as name (for example, `2.x`). The main branch is the branch with the current stable release. +- 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, rename `master` to `1.x`. For a major release, create a new version branch such as `2.x`. The main branch is the branch with the current stable release. ## Commit messages From 0d475c2c2848d7e6b02766465266c4be9105d497 Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Sun, 7 Jan 2024 18:58:52 +0300 Subject: [PATCH 3/4] improve --- 006-git.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/006-git.md b/006-git.md index 5d2ccf0..bed47f9 100644 --- a/006-git.md +++ b/006-git.md @@ -4,7 +4,8 @@ - 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, rename `master` to `1.x`. For a major release, create a new version branch such as `2.x`. The main branch is the branch with the current stable release. +- After the first release, create a new release branch `1.x` and make it main branch. +- Major changes must create in `master` branch. ## Commit messages From c93048db560544d2548f0062f4ddf5f1d161b8a9 Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Mon, 8 Jan 2024 10:23:57 +0300 Subject: [PATCH 4/4] Update 006-git.md Co-authored-by: Alexander Makarov --- 006-git.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/006-git.md b/006-git.md index bed47f9..af4a804 100644 --- a/006-git.md +++ b/006-git.md @@ -5,7 +5,7 @@ - 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 create in `master` branch. +- Major changes must be made in `master` branch. ## Commit messages