jordan 6d52228d94 fix(sdlc): auto-resolve merge conflicts in .sdlc/ state files ... 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>		2026-02-09 16:01:18 -07:00
..
cmd_archive.go	feat: add auth scopes, OpenAPI docs, SDLC guides, and code quality improvements	2026-02-02 13:55:50 -07:00
cmd_artifact.go	feat: add artifact pass/fail/needs-fix lifecycle for SDLC execution phases	2026-02-02 22:14:53 -07:00
cmd_branch.go	fix(sdlc): persist branch metadata on main before feature branch creation	2026-02-09 08:36:10 -07:00
cmd_config.go	feat: add auth scopes, OpenAPI docs, SDLC guides, and code quality improvements	2026-02-02 13:55:50 -07:00
cmd_feature.go	feat: add auth scopes, OpenAPI docs, SDLC guides, and code quality improvements	2026-02-02 13:55:50 -07:00
cmd_init.go	feat: add auth scopes, OpenAPI docs, SDLC guides, and code quality improvements	2026-02-02 13:55:50 -07:00
cmd_merge.go	fix(sdlc): auto-resolve merge conflicts in .sdlc/ state files	2026-02-09 16:01:18 -07:00
cmd_next.go	feat: add auth scopes, OpenAPI docs, SDLC guides, and code quality improvements	2026-02-02 13:55:50 -07:00
cmd_query.go	feat: add auth scopes, OpenAPI docs, SDLC guides, and code quality improvements	2026-02-02 13:55:50 -07:00
cmd_state.go	feat: add auth scopes, OpenAPI docs, SDLC guides, and code quality improvements	2026-02-02 13:55:50 -07:00
cmd_task.go	feat: add auth scopes, OpenAPI docs, SDLC guides, and code quality improvements	2026-02-02 13:55:50 -07:00
cmd_test.go	fix: cookbook tree runner stdout/stderr separation and bash brace expansion	2026-02-02 15:15:02 -07:00
main.go	feat: add SDLC orchestration - library, CLI, and API integration	2026-02-02 09:57:05 -07:00
root.go	feat: add auth scopes, OpenAPI docs, SDLC guides, and code quality improvements	2026-02-02 13:55:50 -07:00