Skip to content

docs(claude): document uv + rebase development workflow#329

Merged
lstein merged 1 commit into
masterfrom
lstein/docs/uv-rebase-workflow
Jun 10, 2026
Merged

docs(claude): document uv + rebase development workflow#329
lstein merged 1 commit into
masterfrom
lstein/docs/uv-rebase-workflow

Conversation

@lstein

@lstein lstein commented Jun 10, 2026

Copy link
Copy Markdown
Owner

Updates CLAUDE.md to document the uv-based development workflow and a rebase-based branch-update flow.

Changes

  • Install: pip install -e .[testing,development]uv sync --extra testing --extra development (legacy command kept as a comment).
  • Run/test: use uv run start_photomap / uv run pytest tests, which resolve the current worktree's .venv and auto-sync first (no activation needed).
  • Worktree bootstrap ("Worktrees are mandatory" section): the venv + activate + pip install dance collapses to a single uv sync.
  • New section "Keeping branches current — rebase, don't merge": documents the git fetch && git rebase origin/master && git push --force-with-lease flow, the rationale (squash-merge keeps master linear), the newly-set pull.rebase=true / rebase.autoStash=true globals, and the "only rebase branches you own" caveat.

Merge ordering

Note

These docs reference uv.lock, which is added in #328. The instructions still work without it (uv sync would generate a lock on first run), but please merge this after #328 so the lockfile exists on master.

Docs-only; no code paths touched.

🤖 Generated with Claude Code

@lstein lstein enabled auto-merge (rebase) June 10, 2026 02:08
Replace the venv/pip bootstrap with `uv sync`, switch run/test commands to
`uv run`, and add a "Keeping branches current — rebase, don't merge" section
covering the fetch/rebase/--force-with-lease flow and the pull.rebase /
rebase.autoStash globals.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@lstein lstein force-pushed the lstein/docs/uv-rebase-workflow branch from 2959455 to 0f09ee0 Compare June 10, 2026 02:09
@lstein lstein merged commit ad4d2ca into master Jun 10, 2026
9 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.

1 participant