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
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 957c8419cb - Show all commits
config/conflict.txt
+1 -1
View File
@@ -1 +1 @@
baseline
feature selects fixture A