main did

branch 1 did
111
1 changed files with 11 additions and 0 deletions
--- a/doc/操作测试用.txt
+++ b/doc/操作测试用.txt
@ -0,0 +1,11 @@
+在doc文件夹下创建文件，使用命令行或TortoiseGit练习基于Git的分布式版本管理操作，包括：
+①本地提交
+②推送到远程仓库、从远程仓库拉取
+③切换分支，通过pull-request提交代码贡献
+④不同分支修改同一地方形成冲突，并解决冲突
+
+
+
+
+branch1
+master
Author	SHA1	Message	Date
RFDeet	171ac4251b	main did	2 years ago
RFDeet	1e50acbadc	branch 1 did	2 years ago
RFDeet	ba85a0e1a9	111	2 years ago