chore: sync main into develop (resolves v0.4.0 release conflicts)#286
Merged
chore: sync main into develop (resolves v0.4.0 release conflicts)#286
Conversation
Versioned documentation with version switcher (#231)
fix: remove CLAUDE.md from repo, add to .gitignore
…264) * 238: feat: draft PR default config (ship.draft) (#259) * feat: add --reviewer and --label flags to ship command (#232, #238) - Add ship.default_reviewers and ship.default_labels config options - CLI flags --reviewer/-r and --label/-l (repeatable) - Request GitHub PR reviewers via API after PR creation - Add labels to PR via GitHub Issues API - CLI flags override config defaults when specified Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * style: cargo fmt Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> * 234: feat: stack navigation comments in PR description (#260) * feat: stack navigation in PR body and stack submit (#234, #235) - Add stack navigation table to PR description showing parent/child relationships - Add `parsec stack --submit` to ship entire stack in topological order - Stack submit stops on first failure to prevent broken dependency chain Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * style: cargo fmt Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> * 257: ci: add Windows test coverage (#258) * ci: add Windows and macOS to test matrix, Windows to build matrix (#257) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * ci: mark Windows tests as continue-on-error until UNC path fix Windows git worktree fails with \\?\ UNC paths from canonicalize(). Tests are informational until the path handling is fixed. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * ci: keep required 'Test' check name, add cross-platform tests separately Branch protection requires check named "Test". Keep ubuntu-only Test job for required checks. Add separate test-cross-platform job for macOS and Windows (informational, continue-on-error). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> * 261: v0.4 features: Windows CI, ship reviewers/labels, stack submit (#262) * fix: add missing reviewers/labels args to stack_submit ship call Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * style: cargo fmt --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> * fix: resolve Windows UNC path issue with dunce crate (#263) canonicalize() on Windows returns \\?\C:\... UNC paths that git cannot handle. Use dunce::canonicalize() which strips the prefix when safe, fixing worktree creation on Windows. Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
* 238: feat: draft PR default config (ship.draft) (#259) * feat: add --reviewer and --label flags to ship command (#232, #238) - Add ship.default_reviewers and ship.default_labels config options - CLI flags --reviewer/-r and --label/-l (repeatable) - Request GitHub PR reviewers via API after PR creation - Add labels to PR via GitHub Issues API - CLI flags override config defaults when specified Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * style: cargo fmt Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> * 234: feat: stack navigation comments in PR description (#260) * feat: stack navigation in PR body and stack submit (#234, #235) - Add stack navigation table to PR description showing parent/child relationships - Add `parsec stack --submit` to ship entire stack in topological order - Stack submit stops on first failure to prevent broken dependency chain Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * style: cargo fmt Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> * 257: ci: add Windows test coverage (#258) * ci: add Windows and macOS to test matrix, Windows to build matrix (#257) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * ci: mark Windows tests as continue-on-error until UNC path fix Windows git worktree fails with \\?\ UNC paths from canonicalize(). Tests are informational until the path handling is fixed. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * ci: keep required 'Test' check name, add cross-platform tests separately Branch protection requires check named "Test". Keep ubuntu-only Test job for required checks. Add separate test-cross-platform job for macOS and Windows (informational, continue-on-error). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> * 261: v0.4 features: Windows CI, ship reviewers/labels, stack submit (#262) * fix: add missing reviewers/labels args to stack_submit ship call Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * style: cargo fmt --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> * fix: resolve Windows UNC path issue with dunce crate (#263) canonicalize() on Windows returns \\?\C:\... UNC paths that git cannot handle. Use dunce::canonicalize() which strips the prefix when safe, fixing worktree creation on Windows. Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> * docs: add ship --reviewer/--label and stack --submit to README and reference (#265) Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR #285 (develop → main for v0.4.0 release) had conflicts because main has 2 PR merges (#264, #266) that aren't on develop — they were merged directly to main. develop has the comprehensive, well-tested versions of those same v0.4 features (via #260, #262, #265).
This PR pulls main into develop with
-X oursstrategy — develop's v0.4 implementation wins on every conflict, and any uniquely-on-main content is preserved (e.g., a stack-navigation table snippet in README).After this merges, PR #285 will be cleanly mergeable.
Verification
cargo checkpasses locally on the merged tree🤖 Generated with Claude Code