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

[test] 冲突合并测试 #7

Merged
liuxing merged 2 commits from test-conflict-b into test-conflict-a 2026-09-21 21:06:08 +08:00
Conversation 0 Commits 2 Files Changed 1
+2
liuxing commented 2026-09-21 21:04:11 +08:00
Collaborator
Copy Link
Copy Source

验证远程冲突解决流程用，测完即删。

验证远程冲突解决流程用，测完即删。
liuxing added 1 commit 2026-09-21 21:04:12 +08:00
test: B侧修改 test.txt 45abf1d0bc
liuxing added 1 commit 2026-09-21 21:05:53 +08:00
merge: 解决 test.txt 冲突 269a25a995 
# Conflicts:
#	test.txt
liuxing merged commit 565a10383b into test-conflict-a 2026-09-21 21:06:08 +08:00
Sign in to join this conversation.
Reviewers
No Reviewers
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#7