merge with no-ff

分支策略
修复冲突
2024-07-23 11:23:33 +08:00 · 2024-07-23 11:20:50 +08:00 · 2024-07-23 10:53:52 +08:00 · 2024-07-23 10:47:15 +08:00 · 2024-07-23 10:44:20 +08:00 · 2024-07-23 10:41:43 +08:00
2 changed files with 2 additions and 0 deletions
--- a/dev2.md
+++ b/dev2.md
--- a/gittest.md
+++ b/gittest.md
@ -1 +1,3 @@
 # 这是一个测试文件的测试
+冲突测试master 和 冲突测试dev1
+分支策略。。。测试
Author	SHA1	Message	Date
huangge1199	cd531a82df	merge with no-ff	2024-07-23 11:23:33 +08:00
huangge1199	bdf65cd85d	分支策略	2024-07-23 11:20:50 +08:00
huangge1199	0d5375b087	修复冲突	2024-07-23 10:53:52 +08:00
huangge1199	b2db3076f0	冲突测试master	2024-07-23 10:47:15 +08:00
huangge1199	0eaa3bee58	冲突测试dev1	2024-07-23 10:44:20 +08:00
huangge1199	6db0b1788c	冲突测试	2024-07-23 10:41:43 +08:00
huangge1199	3e2ac13ec0	冲突测试dev1	2024-07-23 10:33:25 +08:00
huangge1199	359ebdaeb4	新增dev2.md	2024-07-23 09:38:44 +08:00