Merge branch 'main' into branch1

# Conflicts: # README.md
branch修改
4 changed files with 15 additions and 0 deletions
--- a/1.txt
+++ b/1.txt
@ -0,0 +1,6 @@
+<<<<<<< HEAD
+111
+branch1
+=======
+111
+>>>>>>> c00de31092a7080c232bf18df5101a99e9f0c791
--- a/README.md
+++ b/README.md
@ -1,2 +1,10 @@
 # git-test

+main修改
+
+
+branch修改
+
+main第二次修改
+
+
--- a/doc/软件需求规格说明书.doc
+++ b/doc/软件需求规格说明书.doc
--- a/src/1.txt
+++ b/src/1.txt
@ -0,0 +1 @@
+main内容
Author	SHA1	Message	Date
lizhengkun123	b9410410fc	Merge branch 'main' into branch1 # Conflicts: # README.md	3 days ago
lizhengkun123	184e795133	branch修改	3 days ago
lizhengkun123	2e998e6f46	2次修改	3 days ago
lizhengkun123	a99e270b11	1.txt修改	3 days ago
lizhengkun123	379b2dcba6	main第一次提交	3 days ago
lizhengkun123	ad678beb95	Merge branch 'main' of https://bdgit.educoder.net/pjxpm98wh/git-test # Conflicts: # 1.txt	3 days ago
lizhengkun123	747f467c1b	Merge branch 'branch1'	3 days ago
lizhengkun123	dfba51c0be	branch1	3 days ago
lizhengkun123	c3f836d73a	111	3 days ago
lizhengkun123	791742ebea	branch1	3 days ago
lizhengkun123	3f38e0f12d	111	3 days ago
lizhengkun123	c00de31092	111	3 days ago