Merge branch 'cash'

# Conflicts:
#	拉取测试

.gitignore

@@ -1,34 +0,0 @@
-# ---> C++
-# Prerequisites
-*.d
-
-# Compiled Object files
-*.slo
-*.lo
-*.o
-*.obj
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Compiled Dynamic libraries
-*.so
-*.dylib
-*.dll
-
-# Fortran module files
-*.mod
-*.smod
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-*.lib
-
-# Executables
-*.exe
-*.out
-*.app
-

1_代码管理相关技术点.txt

@@ -0,0 +1,46 @@
+# 代码管理相关知识点
+## Git
+- Git的概念
+- 三个区域的概念
+- 仓库的概念
+- 节点的概念
+- 分支的概念
+
+## SourceTree
+- SourceTree的概念
+- 仓库相关操作
+	· 创建本地仓库
+	· 打开本地仓库
+	· 克隆远程仓库
+	· 获取
+	· 关联远程仓库
+- 节点相关操作
+	· 提交
+	· 重置
+	· 回滚提交
+- 分支相关操作
+	· 新建分支
+	· 合并分支
+	· 删除分支
+	· 切换分支
+	· 制造冲突
+	· 解决冲突
+	· 拉取
+	· 推送
+- 其他
+	· 书写忽略文件
+	· 停止跟踪
+	· 创建补丁1种
+	· 应用补丁1种
+	· 贮藏
+	· 丢弃
+	· 移除
+	· 创建标签
+	· 删除标签
+- 综合
+	· 一系列操作后最终状态
+
+附加：
+- 变基
+- 创建补丁2种及以上
+- 应用补丁2种及以上

LICENSE

@@ -1,19 +0,0 @@
-MIT License Copyright (c) <year> <copyright holders>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
-OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,3 +0,0 @@
-# first-stage
-
-用来联系

拉取测试

@@ -1 +1,2 @@
-hello world
+hello world
+test2