Skip to content

docs: README note on rebasing stacked PRs#58

Merged
silversurfer562 merged 1 commit into
mainfrom
docs/stacked-pr-rebase-note
May 24, 2026
Merged

docs: README note on rebasing stacked PRs#58
silversurfer562 merged 1 commit into
mainfrom
docs/stacked-pr-rebase-note

Conversation

@silversurfer562
Copy link
Copy Markdown
Member

@silversurfer562 silversurfer562 commented May 24, 2026

Summary

  • Adds a short ### Stacked pull requests subsection under ## Development in README.md.
  • Documents the git rebase --onto main <old-base-sha> <branch> move for resolving conflicts after a stacked PR's base merges. (Generic — the recent friction was in another repo, but the recipe applies everywhere.)

Test plan

  • README renders correctly on github.com

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
@silversurfer562 silversurfer562 merged commit 224783f into main May 24, 2026
5 checks passed
silversurfer562 added a commit that referenced this pull request May 25, 2026
attune-rag 0.2.0 shipped 2026-05-25 as the first SemVer-binding
cut — purely additive (new measure_corpus module + alias-file
helpers; no breaking API changes). The current core pin caps at
<0.2, silently locking fresh installs to attune-rag 0.1.23 even
when 0.2.x is available.

Widen the cap to <0.3 to unblock attune-rag 0.2.x installs.

The cap widen is the trigger for promoting the pending
[Unreleased] content to a real release. That content has been
queued on `main` since v0.7.1 (2026-05-22):

  - MCP server Phases 1-5 (PRs #49-#56) — new attune-gui-mcp
    console script with 6 tools (5 read-mostly + gui_set_spec_status
    write); 30+ tests across test_mcp_tools.py and
    test_mcp_integration.py
  - **Status:** parser fix (PR #57)
  - Living-docs regen automation Phase 1 (PRs #60-#63)
  - Home interpreter snapshot (PR #59)
  - Stacked-rebase README note (PR #58)

Bumped 0.7.1 → 0.8.0 (minor) for the new MCP tool surface.

Local smoke (python 3.10, fresh venv):
  pip install -e .[dev]
  → attune-gui 0.8.0, attune-rag 0.2.0
  545/545 sidecar tests pass (1 playwright skip, unrelated).
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