sh_stu0814/max_code_test_gitea_2
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: sh_stu0814/max_code_test_gitea_2:featureA
Branches Tags
sh_stu0814/max_code_test_gitea_2:master sh_stu0814/max_code_test_gitea_2:dev_zeng sh_stu0814/max_code_test_gitea_2:dev-wangbo sh_stu0814/max_code_test_gitea_2:shark sh_stu0814/max_code_test_gitea_2:fen_sh sh_stu0814/max_code_test_gitea_2:featureA sh_stu0814/max_code_test_gitea_2:hzh
...
pull from: sh_stu0814/max_code_test_gitea_2:dev-wangbo
Branches Tags
sh_stu0814/max_code_test_gitea_2:master sh_stu0814/max_code_test_gitea_2:dev_zeng sh_stu0814/max_code_test_gitea_2:dev-wangbo sh_stu0814/max_code_test_gitea_2:shark sh_stu0814/max_code_test_gitea_2:fen_sh sh_stu0814/max_code_test_gitea_2:featureA sh_stu0814/max_code_test_gitea_2:hzh
2 Commits
featureA ... dev-wangbo
Author SHA1 Message Date
wangbo_stu 75ea1ae75e wangbo修改的冲突代码 2026-09-21 21:40:18 +08:00
wangbo_stu a03f020ad5 小组内俩俩完成一次冲突的处理并截图 2026-09-21 21:12:20 +08:00
2 changed files with 2 additions and 2 deletions
Expand all files Collapse all files
test_1.txt
+1 -1
View File
@@ -1,2 +1,2 @@
dadsad
dsdsad
wangbo修改的冲突代码
test_2.txt
+1 -1
View File
@@ -1,2 +1,2 @@
dadsad
dsdsad
wangbo修改的冲突代码