mirror of
https://github.com/bmad-code-org/BMAD-METHOD.git
synced 2026-08-30 17:14:59 +08:00
6dd41a1d0e
Five conflicts, all from main moving under this branch: - marketplace.json: main collapsed six plugins into one and dropped every v6-shims entry. Took main's structure and swapped create-epics-and-stories for bmad-ticket in its alphabetical slot, leaving the shim unlisted to match the new convention. - CHANGELOG.md: main cut v6.11.0, so this branch's Unreleased entries were stale duplicates of released ones. Took main's file and opened a fresh Unreleased section holding only the two entries that are genuinely new here. - module-help.csv: main rewrote every row. Took main's and swapped the one row, keeping menu code CE — repointing a trigger without renaming it is the precedent IR set when check-implementation-readiness folded away, and the PM agent already does the same. - The two create-epics-and-stories files main touched in #2704: took the delete. Its only change was python3 -> uv run, and the shim that replaced those files never called python3. Sidebar order moved 18 -> 17: main removed the adversarial-review page, freeing the slot this page was skipping past.