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

Compare commits

merge into: codex-test/demo-ci-lab:feature/squash-history
codex-test/demo-ci-lab:master codex-test/demo-ci-lab:feature/review-roundtrip codex-test/demo-ci-lab:feature/rebase-demo codex-test/demo-ci-lab:feature/conflicting-config codex-test/demo-ci-lab:feature/squash-history codex-test/demo-ci-lab:feature/closed-proposal
codex-test/demo-ci-lab:v3.2.0-rebase-demo codex-test/demo-ci-lab:v3.0.0-demo
..
pull from: codex-test/demo-ci-lab:feature/conflicting-config
codex-test/demo-ci-lab:feature/review-roundtrip codex-test/demo-ci-lab:master codex-test/demo-ci-lab:feature/rebase-demo codex-test/demo-ci-lab:feature/conflicting-config codex-test/demo-ci-lab:feature/squash-history codex-test/demo-ci-lab:feature/closed-proposal
codex-test/demo-ci-lab:v3.2.0-rebase-demo codex-test/demo-ci-lab:v3.0.0-demo
2 Commits
feature/squash-history .. feature/conflicting-config
Author SHA1 Message Date
codex-test 957c8419cb feat: 保留真实合并冲突 2026-10-12 15:23:43 +00:00
codex-test e30daf2a6a feat: squash advanced demo history 2026-10-12 15:23:40 +00:00
1 changed files with 1 additions and 1 deletions
Expand all files Collapse all files
config/conflict.txt
+1 -1
View File
@@ -1 +1 @@
baseline
feature selects fixture A