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

Compare commits

base: sh_stu0814/max_code_test_gitea_2:e609bb149297110aad593d5835e04a76647f6b0a
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
...
compare: sh_stu0814/max_code_test_gitea_2:master
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
19 Commits
e609bb1492 ... master
Author SHA1 Message Date
zengjingyu 5bddd97884 Merge pull request 'chongtu1' (#10) from dev_zeng into master 
Reviewed-on: #10
 2026-09-21 21:49:18 +08:00
zengjingyu fb9a2518ec chongtujiejue 2026-09-21 21:46:37 +08:00
wangbo_stu 82da024fc7 Merge pull request 'wangbo修改的冲突代码' (#9) from dev-wangbo into master 
Reviewed-on: #9
 2026-09-21 21:43:51 +08:00
zengjingyu cb3a701e25 chongtu1 2026-09-21 21:42:44 +08:00
wangbo_stu 75ea1ae75e wangbo修改的冲突代码 2026-09-21 21:40:18 +08:00
sya 7cafe5e13c Merge pull request '测试冲突' (#7) from shark into master 
Reviewed-on: #7
 2026-09-21 21:31:25 +08:00
sya e3317df720 Merge branch 'master' of http://47.106.207.27:3000/sh_stu0814/max_code_test_gitea_2 2026-09-21 21:28:31 +08:00
wangbo_stu 367acf4099 Merge pull request '小组内俩俩完成一次冲突的处理并截图' (#8) from dev-wangbo into master 
Reviewed-on: #8
 2026-09-21 21:19:55 +08:00
wangbo_stu a03f020ad5 小组内俩俩完成一次冲突的处理并截图 2026-09-21 21:12:20 +08:00
sh_stu0814 87a8505d66 Merge pull request '我加了一个xxod' (#3) from featureA into master 
Reviewed-on: #3
 2026-09-21 21:07:31 +08:00
sya 879ad1ca47 2s 2026-09-21 21:07:20 +08:00
david 1901e7b510 fix:解决冲突 2026-09-21 21:06:16 +08:00
sh_stu0814 e7a6d46596 Merge pull request 'aa' (#5) from fen_sh into master 
Reviewed-on: #5
 2026-09-21 21:01:21 +08:00
jianqi 356d050f0f ww 2026-09-21 21:01:06 +08:00
sh_stu0814 57b5594a86 Merge pull request 'add_he' (#4) from hzh into master 
Reviewed-on: #4
 2026-09-21 20:57:35 +08:00
sh_stu0814 9b76a1bc8e Merge branch 'master' into hzh 2026-09-21 20:57:22 +08:00
hzh be4e3a96bb add_he 2026-09-21 20:56:23 +08:00
sh_stu0814 169be026dd Merge pull request 'sh_1' (#2) from fen_sh into master 
Reviewed-on: #2
 2026-09-21 20:54:35 +08:00
david d2a37f76fb 我加了一个xxod 2026-09-21 20:46:11 +08:00
3 changed files with 10 additions and 6 deletions
Expand all files Collapse all files
test_1.txt
+3 -2
View File
@@ -1,2 +1,3 @@
dadsad sya修改的冲突代码
dsdsad wangbo修改的冲突代码
test_2.txt
+2 -2
View File
@@ -1,2 +1,2 @@
dadsad sghgsng
dsdsad wangbo修改的冲突代码
test_3.txt
+5 -2
View File
@@ -1,3 +1,6 @@
dadsad dadsad
dsaidjwqijq dsdsadxxod
孙浩冲突
孙浩冲突
何