From b079dba6813b5185b707aba55fa3db8e7db7f1fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=98=89=E6=99=9F?= Date: Thu, 22 Aug 2024 09:34:32 +0800 Subject: [PATCH] Fix typo: corrected "error branch" to "feature branch" in documentation It should be "error branch" to merge to the production here --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 19de3a3..f2b989d 100644 --- a/README.md +++ b/README.md @@ -127,9 +127,9 @@ Wait for the *Merge Request* to be approved and the build of the master branch t -When automatic tests pass in the master branch, due to urgency, you should not wait for the master branch to be merged in other environments branches. Make a *merge / merge request* **from your feature branch** to **all** other branches of internal environments. +When automatic tests pass in the master branch, due to urgency, you should not wait for the master branch to be merged in other environments branches. Make a *merge / merge request* **from your error correction branch** to **all** other branches of internal environments. -As your feature branch is the production branch with your new commit, usually just a unique commit will be merged to the production branch. Make sure to merge these changes to all environments branches. Or the error correction / urgent change can be lost. +As your error correction branch is the production branch with your new commit, usually just a unique commit will be merged to the production branch. Make sure to merge these changes to all environments branches. Or the error correction / urgent change can be lost. Create a tag, to mark a new system version.