jordan/rdev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(sdlc): auto-resolve merge conflicts in .sdlc/ state files
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
Details

Browse Source 
Both main and the feature branch modify .sdlc/state.yaml during the
SDLC lifecycle. Use -X theirs to auto-resolve conflicts in favor of the
feature branch, whose state is more current.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
jordan 2026-02-09 16:01:18 -07:00
parent 8b5842682d
commit 6d52228d94
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/sdlc/cmd_merge.go
View File

@ -122,8 +122,10 @@ var mergeCmd = &cobra.Command{
mergeRef = "origin/" + f.Branch mergeRef = "origin/" + f.Branch
} }
// Merge // Merge with -X theirs to auto-resolve .sdlc/ state conflicts.
mergeArgs := []string{"merge"} // Both main and feature branch modify .sdlc/state.yaml; the feature
// branch version is more current and post-merge updates will overwrite.
mergeArgs := []string{"merge", "-X", "theirs"}
if strategy == "squash" { if strategy == "squash" {
mergeArgs = append(mergeArgs, "--squash") mergeArgs = append(mergeArgs, "--squash")
} }