From b7bebe10e458de97ee3244ee14705bc50a434c02 Mon Sep 17 00:00:00 2001 From: LiYilin Date: Sat, 12 Mar 2016 00:57:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?rebase=E7=9A=84=E4=B8=80=E4=BA=9B=E7=90=86?= =?UTF-8?q?=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code_to_copy/backend/sa/version_management.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code_to_copy/backend/sa/version_management.sh b/code_to_copy/backend/sa/version_management.sh index c4ea403..1838b96 100644 --- a/code_to_copy/backend/sa/version_management.sh +++ b/code_to_copy/backend/sa/version_management.sh @@ -90,7 +90,8 @@ git submodule update --init --recursive # 其实千言万语可以汇成一句 git remote add upstream https://github.com/yeasy/docker_practice git fetch upstream git checkout master -git rebase upstream/master +git rebase upstream/master +# rebase 的过程中会遇到冲突，这时应该编辑，提交，然后继续rebase < Date: Sat, 12 Mar 2016 01:03:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E7=90=86=E8=A7=A3=20reba?= =?UTF-8?q?se?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code_to_copy/backend/sa/version_management.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code_to_copy/backend/sa/version_management.sh b/code_to_copy/backend/sa/version_management.sh index 1838b96..486ff92 100644 --- a/code_to_copy/backend/sa/version_management.sh +++ b/code_to_copy/backend/sa/version_management.sh @@ -91,7 +91,7 @@ git remote add upstream https://github.com/yeasy/docker_practice git fetch upstream git checkout master git rebase upstream/master -# rebase 的过程中会遇到冲突，这时应该编辑，提交，然后继续rebase +# rebase 的过程中会遇到冲突，这时应该编辑，然后add，**千万不要commit**，然后继续rebase < Date: Sat, 12 Mar 2016 01:09:59 +0800 Subject: [PATCH 3/3] rebase --- code_to_copy/backend/sa/version_management.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/code_to_copy/backend/sa/version_management.sh b/code_to_copy/backend/sa/version_management.sh index 486ff92..b5fe3c8 100644 --- a/code_to_copy/backend/sa/version_management.sh +++ b/code_to_copy/backend/sa/version_management.sh @@ -92,6 +92,7 @@ git fetch upstream git checkout master git rebase upstream/master # rebase 的过程中会遇到冲突，这时应该编辑，然后add，**千万不要commit**，然后继续rebase +# 比如你开发到一半，别的commit对你有影响，这时你rebase然后继续开发会更好 <