Skip to content

Fix stackpanel init#9

Merged
cooper (czxtm) merged 11 commits intomainfrom
jp/fix-init
Mar 28, 2026
Merged

Fix stackpanel init#9
cooper (czxtm) merged 11 commits intomainfrom
jp/fix-init

Conversation

@arximboldi
Copy link
Copy Markdown
Contributor

@arximboldi Juanpe Bolívar (arximboldi) commented Mar 25, 2026

  • Resolve merge conflicts with main branch
    • README.md - use public github:darkmatter/stack URLs from main
    • README.tmpl.md - use public github:darkmatter/stack URLs from main
    • apps/stackpanel-go/cmd/cli/init.go - use github:darkmatter/stackpanel flake ref, update .stack/ paths
    • apps/stackpanel-go/pkg/nixeval/eval.go - take main's ProjectRoot + configurable timeout, keep 10min default
    • apps/stackpanel-go/pkg/nixeval/presets.go - update comment to use github:darkmatter/stackpanel
    • docs/ARCHITECTURE.md - use github:darkmatter/stack from main
    • docs/MODULE_BOILERPLATE_INJECTION.md - use github:darkmatter/stack from main
    • nix/flake/templates/README.md - use github:darkmatter/stack URLs from main
    • nix/flake/templates/_test-fixtures/README.md - use github:darkmatter/stack URLs from main
    • nix/stackpanel/db/default.nix - include main's new initFiles section
    • nix/stackpanel/db/schemas/config.proto.nix - use .stack/config.nix path + boilerplate from main
    • nix/stackpanel/devshell/bin.nix - keep gitignore entry, update path to .stack/bin/
    • nix/stackpanel/modules/bun/module.nix - keep bun language enablement, use main's comment style

📍 Connect Copilot coding agent with Jira, Azure Boards or Linear to delegate work to Copilot in one click without leaving your project management tool.

@czxtm
Copy link
Copy Markdown
Contributor

Copilot fix conflicts

Copy link
Copy Markdown

Copilot AI commented Mar 28, 2026

Copilot fix conflicts

Conflicts resolved in commit 2eab247. The key resolutions were:

  • URLs updated to use github:darkmatter/stack (public) in docs/READMEs, and github:darkmatter/stackpanel in Go CLI code
  • .stackpanel/.stack/ directory references updated throughout
  • eval.go: took main's improved EvalOnce with configurable timeout + ProjectRoot handling, while preserving the 10-minute default from this branch
  • bin.nix: kept the gitignore entry for the bin directory (from this branch) but updated the path to .stack/bin/
  • db/default.nix + config.proto.nix: included main's new initFiles/boilerplate scaffolding additions
  • bun/module.nix: kept bun language enablement from this branch with main's updated comment style

@czxtm cooper (czxtm) merged commit 6197924 into main Mar 28, 2026
17 of 24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants