xianyaowen/happypoker
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: xianyaowen/happypoker:dev_yww
Branches Tags
xianyaowen/happypoker:main xianyaowen/happypoker:dev1 xianyaowen/happypoker:dev2 xianyaowen/happypoker:liux_dev xianyaowen/happypoker:dev xianyaowen/happypoker:xianyaowen-patch-1 xianyaowen/happypoker:dev_yww xianyaowen/happypoker:liuxing_work xianyaowen/happypoker:master
...
pull from: xianyaowen/happypoker:dev2
Branches Tags
xianyaowen/happypoker:dev1 xianyaowen/happypoker:dev2 xianyaowen/happypoker:main xianyaowen/happypoker:liux_dev xianyaowen/happypoker:dev xianyaowen/happypoker:xianyaowen-patch-1 xianyaowen/happypoker:dev_yww xianyaowen/happypoker:liuxing_work xianyaowen/happypoker:master
32 Commits
dev_yww ... dev2
Author SHA1 Message Date
xianyaowen ed6e3800a3 Merge branch 'main' into dev2 2026-09-22 08:51:17 +08:00
冼耀文 6caadb4464 ddd 2026-09-21 21:31:42 +08:00
简文瑞 0fbf8bd102 ;rgb:bfbf/bfbf/bfbf 2026-09-21 21:17:03 +08:00
简文瑞 9103fccb97 冲突测试 2026-09-21 21:07:20 +08:00
akun f99e6bd264 删除 conflict_demo.txt 2026-09-21 20:46:32 +08:00
akun ca02511d21 李四修改了冲突行 2026-09-21 20:44:45 +08:00
akun 8f578fd31c akun修改了冲突行 2026-09-21 20:44:17 +08:00
akun 5635d83203 李四修改了冲突文件 2026-09-21 20:43:19 +08:00
akun 7514490604 akun修改了冲突文件 2026-09-21 20:42:59 +08:00
akun ec98b67b5a Merge branch 'main' of http://47.106.207.27:3000/xianyaowen/happypoker 2026-09-21 20:41:37 +08:00
akun 9652af15b3 akun修改了冲突演示文件 2026-09-21 20:40:49 +08:00
akun 1037eeb639 删除 akun_new.txt 2026-09-21 20:38:30 +08:00
简文瑞 cfbad17943 冲突测试2 2026-09-21 20:31:25 +08:00
akun 4896eb49be Merge branch 'main' of http://47.106.207.27:3000/xianyaowen/happypoker 2026-09-21 20:29:03 +08:00
akun 791905fa2c akun新增了一个文件 2026-09-21 20:27:25 +08:00
liuxing f45809e1ef Merge pull request '提交测试数据' (#2) from liuxing_work into main 
Reviewed-on: #2
 2026-09-21 20:25:19 +08:00
liuxing 1be3b5e28c Merge pull request 'Liux dev' (#3) from liux_dev into main 
Reviewed-on: #3
 2026-09-21 20:24:49 +08:00
liuxing 18fe531adf Merge branch 'main' into liux_dev 2026-09-21 20:24:30 +08:00
简文瑞 56cee2d5d3 ;rgb:bfbf/bfbf/bfbfrgb:0000/0000/0000 2026-09-21 20:06:10 +08:00
简文瑞 f43cd76a6d 测试冲突 2026-09-21 20:05:34 +08:00
xingliu0721 050bb166e3 Merge remote-tracking branch 'origin/xianyaowen-patch-1' 
# Conflicts:
#	main.py
 2026-09-21 20:05:02 +08:00
简文瑞 b88a48f904 ;rgb:bfbf/bfbf/bfbf 2026-09-21 19:58:00 +08:00
简文瑞 456375bc91 该文件修改了第一行 2026-09-21 19:56:55 +08:00
liuxing b0c49e2759 Merge branch 'main' into liuxing_work 2026-09-21 19:53:13 +08:00
孙碧蕾 6f66207afa Merge branch 'main' of http://47.106.207.27:3000/xianyaowen/happypoker 2026-09-21 19:49:55 +08:00
孙碧蕾 b78d6264af 111 2026-09-21 19:47:09 +08:00
mister-ye f682409c00 ;rgb:bfbf/bfbf/bfbfrgb:0000/0000/0000 2026-09-21 19:47:05 +08:00
简文瑞 8bd0bdf615 简的提交测试 2026-09-21 19:45:54 +08:00
mister-ye e0c02d6080 ;rgb:bfbf/bfbf/bfbfrgb:0000/0000/0000 2026-09-21 19:45:10 +08:00
xingliu0721 0e23e04f9d 提交测试数据 2026-09-21 19:25:23 +08:00
liuxing 6e57af40bc Merge branch 'main' into xianyaowen-patch-1 2026-09-21 19:07:01 +08:00
xianyaowen 9c05a29aa4 上传文件至「/」 2026-09-21 17:13:31 +08:00
5 changed files with 5 additions and 2 deletions
Expand all files Collapse all files
happypoker
Submodule
+1
Submodule happypoker added at 3b688dbc97
jian_commit.txt
+1
View File
@@ -0,0 +1 @@
提交提交提交
requirements_1.txt
+1 -1
View File
@@ -1,4 +1,4 @@
# FastAPI 核心框架（保留你指定的版本） # FastAPI 核心框架（保留你指定的版本） %简文瑞埋下的一个冲突
fastapi~=0.124.2 fastapi~=0.124.2
# ASGI 服务器（带standard扩展，适配最新版） # ASGI 服务器（带standard扩展，适配最新版）
uvicorn[standard]~=0.38.0 uvicorn[standard]~=0.38.0
sbl.txt
+1
View File
@@ -0,0 +1 @@
冲突测试
this_is_dev.txt
+1 -1
View File
@@ -1 +1 @@
dev__init__ ddd