Merge branch 'main' of https://bdgit.educoder.net/p4gikqjzc/cwh_Git-test

冲突
1 changed files with 3 additions and 1 deletions
--- a/1.txt
+++ b/1.txt
@ -1,3 +1,5 @@
 2067809724
 branch1
-branch2
+branch2
+产生冲突
+冲突
Author	SHA1	Message	Date
chenwenhui111	7c87ac8398	Merge branch 'main' of https://bdgit.educoder.net/p4gikqjzc/cwh_Git-test	1 month ago
chenwenhui111	e2f2e78356	冲突	1 month ago
chenwenhui111	38d3ac2b9f	冲突	1 month ago
chenwenhui111	81f0a57461	Merge branch 'main' of https://bdgit.educoder.net/p4gikqjzc/cwh_Git-test	1 month ago
chenwenhui111	e88887f3c9	branch2 产生冲突	1 month ago
chenwenhui111	2a27c9ba76	branch2	1 month ago
chenwenhui111	0597932d21	Merge branch 'chenwenhui_branch2'	1 month ago
chenwenhui111	d882d47965	branch1	1 month ago