$ git checkout DevOps_RC2
Switched to branch 'DevOps_RC2'
Your branch is behind 'origin/DevOps_RC1' by 1 commit, and can be fast-forwarded.
(use "git pull" to update your local branch)
$ git pull
warning: ----------------- SECURITY WARNING ----------------
warning: | TLS certificate verification has been disabled! |
warning: ---------------------------------------------------
warning: HTTPS connections may not be secure. See https://aka.ms/gcmcore-tlsverify for more information.
warning: ----------------- SECURITY WARNING ----------------
warning: | TLS certificate verification has been disabled! |
warning: ---------------------------------------------------
warning: HTTPS connections may not be secure. See https://aka.ms/gcmcore-tlsverify for more information.
Updating f7ed8ad..c11bb1a
Fast-forward
Readme.md | 1 +
1 file changed, 1 insertion(+)
$ git status
On branch DevOps_RC1
Your branch is up to date with 'origin/DevOps_RC1'.
You have unmerged paths.#有未合并的分支
(fix conflicts and run "git commit")#修复冲突并且运行git commit
(use "git merge --abort" to abort the merge) #使用 git merge --abort终止合并
Unmerged paths:#未合并的分支
(use "git add <file>..." to mark resolution)
both modified: Readme.md
no changes added to commit (use "git add" and/or "git commit -a")
$ git checkout DevOps_Dev
Switched to branch 'DevOps_Dev'
Your branch is up to date with 'origin/DevOps_Dev'.
On branch DevOps_Dev
Your branch is up to date with 'origin/DevOps_Dev'.
You are currently cherry-picking commit 900d39d.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
deleted by us: 3.txt
no changes added to commit (use "git add" and/or "git commit -a")
commit 1c6e4116363e0dce9a931eeaad1d1dcd470bb673 (HEAD -> DevOps_RC3, tag: V0.3FixBug, origin/DevOps_V0.3FixBug, DevOps_V0.3FixBug)
Author: zhangsan <zhangsan@263.com>
Date: Sat Jul 10 14:07:01 2021 +0800
修复了V0.3FixBug
diff --git a/Readme.md b/Readme.md
index 6c1b17d..82f1ecb 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1 +1,2 @@
this is my first add
+修改了V0.3FixBug的Bug
commit e76012d77857841d344ac04893a158e75e8088fc
Author: zhangsan <zhangsan@263.com>
Date: Sat Jul 10 10:56:46 2021 +0800
添加Readme.md文件
diff --git a/Readme.md b/Readme.md
new file mode 100644
index 0000000..6c1b17d
--- /dev/null
+++ b/Readme.md
@@ -0,0 +1 @@
+this is my first add
diff --git a/3.txt b/3.txt
new file mode 100644
index 0000000..13137df
--- /dev/null
+++ b/3.txt
@@ -0,0 +1 @@
+我想测试一下cherry-pick [commit]
diff --git a/Readme.md b/Readme.md
index 561f60a..8b12de6 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,3 +1,2 @@
this is my first add
-修改了V0.3FixBug的Bug
diff --git a/3.txt b/3.txt
new file mode 100644
index 0000000..13137df
--- /dev/null
+++ b/3.txt
@@ -0,0 +1 @@
+我想测试一下cherry-pick [commit]
diff --git a/Readme.md b/Readme.md
index 561f60a..8b12de6 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,3 +1,2 @@
this is my first add
-修改了V0.3FixBug的Bug
-测试一下git diff
+this is my first commit -a
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
new file mode 100644
index 0000000..1a4e89a
--- /dev/null
+++ b/ReleaseNotes.md
@@ -0,0 +1,26 @@
+Version:(Dev_v1.0)
+
+Introduction:
+ welcome to use NCF package , using it , you can develop your personal control-application code quickly.
+
+ more information http://www.devops.com
+
+ this version is from V0.3FixBug
+
+
+System Requirements:
+ - CPU: 2C
+ - OS: windows7 64位
+ - Memory: 1G
+ - Hard-disk: 40G
+ - Others:
+Runtime Environment
+
+V0.3FixBug
+ - 修改Demo程序bug
+
+Dev_v1.0
+ - 建立DevOps平台项目
+ - 建立DevOps项目
+ - 需要.netframework4.6.1支持
+ - 需要mysqlV5.1.5支持
(END)
warning: ----------------- SECURITY WARNING ----------------
warning: | TLS certificate verification has been disabled! |
warning: ---------------------------------------------------
warning: HTTPS connections may not be secure. See https://aka.ms/gcmcore-tlsverify for more information.
warning: ----------------- SECURITY WARNING ----------------
warning: | TLS certificate verification has been disabled! |
warning: ---------------------------------------------------
warning: HTTPS connections may not be secure. See https://aka.ms/gcmcore-tlsverify for more information.
* remote origin
Fetch URL: http://192.168.145.89/devops/devops.git
Push URL: http://192.168.145.89/devops/devops.git
HEAD branch: master
Remote branches:
DevOps_Dev tracked
DevOps_RC tracked
DevOps_RC1 tracked
DevOps_RC3 tracked
DevOps_Release tracked
DevOps_V0.3FixBug tracked
master tracked
Local branches configured for 'git pull':
DevOps_Dev merges with remote DevOps_Dev
DevOps_RC merges with remote DevOps_RC
DevOps_RC1 merges with remote DevOps_RC1
DevOps_RC2 merges with remote DevOps_RC1
DevOps_Release merges with remote DevOps_Release
DevOps_V0.3FixBug merges with remote DevOps_V0.3FixBug
master merges with remote master
Local refs configured for 'git push':
DevOps_Dev pushes to DevOps_Dev (up to date)
DevOps_RC pushes to DevOps_RC (up to date)
DevOps_RC1 pushes to DevOps_RC1 (up to date)
DevOps_RC3 pushes to DevOps_RC3 (fast-forwardable)
DevOps_Release pushes to DevOps_Release (up to date)
DevOps_V0.3FixBug pushes to DevOps_V0.3FixBug (up to date)
master pushes to master (up to date)