From 71f6ccf0bf27974502e15ef23462c1b35f4d3a90 Mon Sep 17 00:00:00 2001 From: LiZhong Date: Wed, 15 Nov 2023 09:51:40 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8F=91=E7=94=9F=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 111.txt | 4 ++++ README.md | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 111.txt diff --git a/111.txt b/111.txt new file mode 100644 index 0000000..5d5e72e --- /dev/null +++ b/111.txt @@ -0,0 +1,4 @@ +导航1 +导航2 +导航3 +导航4 \ No newline at end of file diff --git a/README.md b/README.md index e69de29..d688ba1 100644 --- a/README.md +++ b/README.md @@ -0,0 +1,12 @@ + +1. main 分支现在是生产 +2. dev 分支是测试环境 +3. feat 分支是从 dev 拉过来的分支做某个业务开发 + +现在存在的问题 +终极问题:解决发布生产时代码 找出从dev自己写过的代码合并到 main + +还原场景 +1. 创建main分支 +2. 创建dev +3. 创建feat \ No newline at end of file