主干的变基

Signed-off-by: 17870919867 <17870919867@163.com>
Revert "停止跟踪"
--- a/GIT的概念.txt
+++ b/GIT的概念.txt
@@ -11,3 +11,6 @@ Git 是什么：分布式版本控制系统，用于追踪文件变化
 这是feature/test分支新增的内容

 冲突test


 主干变基修改
--- a/忽略.gitignore
+++ b/忽略.gitignore
@@ -0,0 +1 @@
 # 忽略编译生成的临时文件
Yazar	SHA1	Mesaj	Tarih
17870919867	d14065461a	主干的变基 Signed-off-by: 17870919867 <17870919867@163.com>	4 hafta önce
17870919867	33b36bc0d7	Revert "停止跟踪" This reverts commit `a06d57a1d2`.	4 hafta önce
17870919867	a06d57a1d2	停止跟踪 Signed-off-by: 17870919867 <17870919867@163.com>	4 hafta önce
17870919867	647c3684dd	忽略文件 Signed-off-by: 17870919867 <17870919867@163.com>	4 hafta önce