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

Dev2 #12

Open
xianyaowen wants to merge 19 commits from dev2 into dev
pull from: dev2
merge into: :dev
Conversation 0 Commits 19 Files Changed 3
+3 -2
xianyaowen commented 2026-09-22 08:54:03 +08:00
Owner
Copy Link
Copy Source
No description provided.
xianyaowen added 19 commits 2026-09-22 08:54:03 +08:00
提交测试数据 0e23e04f9d
Merge branch 'main' into liuxing_work b0c49e2759
Merge pull request 'Liux dev' (#3) from liux_dev into main 1be3b5e28c 
Reviewed-on: #3
Merge pull request '提交测试数据' (#2) from liuxing_work into main f45809e1ef 
Reviewed-on: #2
akun新增了一个文件 791905fa2c
Merge branch 'main' of http://47.106.207.27:3000/xianyaowen/happypoker 4896eb49be
冲突测试2 cfbad17943
删除 akun_new.txt 1037eeb639
akun修改了冲突演示文件 9652af15b3
Merge branch 'main' of http://47.106.207.27:3000/xianyaowen/happypoker ec98b67b5a
akun修改了冲突文件 7514490604
李四修改了冲突文件 5635d83203
akun修改了冲突行 8f578fd31c
李四修改了冲突行 ca02511d21
删除 conflict_demo.txt f99e6bd264
冲突测试 9103fccb97
;rgb:bfbf/bfbf/bfbf 0fbf8bd102
ddd 6caadb4464
Merge branch 'main' into dev2 ed6e3800a3
xianyaowen requested review from zhj_student 2026-09-22 08:54:03 +08:00
This pull request has changes conflicting with the target branch.
  • sbl.txt
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin dev2:dev2
git checkout dev2
Sign in to join this conversation.
Reviewers
No Reviewers
zhj_student
Labels
No items
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
akun jianwenrui liuxing sunbilei yww_520 zhj_student xianyaowen
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: xianyaowen/happypoker#12