main did

branch 1 did
1 changed files with 7 additions and 1 deletions
--- a/doc/操作测试用.txt
+++ b/doc/操作测试用.txt
@ -2,4 +2,10 @@
 ①本地提交
 ②推送到远程仓库、从远程仓库拉取
 ③切换分支，通过pull-request提交代码贡献
-④不同分支修改同一地方形成冲突，并解决冲突
+④不同分支修改同一地方形成冲突，并解决冲突
+
+
+
+
+branch1
+master
Author	SHA1	Message	Date
RFDeet	171ac4251b	main did	2 years ago
RFDeet	1e50acbadc	branch 1 did	2 years ago