codex-test/demo-ci-lab
1
0 Fork 0
Code Issues 1 Pull Requests 2 Packages Projects Releases 1 Wiki Activity

[演示] 保留真实合并冲突 #3

Open
codex-test wants to merge 1 commits from feature/conflicting-config into master
pull from: feature/conflicting-config
merge into: codex-test:master
Conversation 0 Commits 1 Files Changed 1
+1 -1
codex-test commented 2026-10-12 15:23:44 +00:00
Owner
Copy link
Copy source

合成 Git 协作记录，不用于生产发布。

合成 Git 协作记录，不用于生产发布。
codex-test added 1 commit 2026-10-12 15:23:44 +00:00
feat: 保留真实合并冲突 957c8419cb
This pull request has changes conflicting with the target branch.
  • config/conflict.txt
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feature/conflicting-config:feature/conflicting-config
git checkout feature/conflicting-config
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
[DEMO] discussion
Synthetic issue discussion fixture
 [DEMO] rebase
Synthetic rebase review fixture
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
codex-test
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: codex-test/demo-ci-lab#3