Skip to content

Add branch merge history commands#334

Merged
adamziel merged 1 commit into
trunkfrom
codex/merge-history-tree
May 18, 2026
Merged

Add branch merge history commands#334
adamziel merged 1 commit into
trunkfrom
codex/merge-history-tree

Conversation

@adamziel
Copy link
Copy Markdown
Contributor

What it does

Adds forkpress branch history and forkpress branch tree as focused ways to inspect merge run history. Both commands show source -> target edges with the existing decision and conflict counts.

Also adds --records runs to the lower-level COW merge audit command for automation.

Rationale

Reviewing conflicts was possible through merge-audit, but seeing merge history required knowing the full audit command or cloning the Git mirror. This gives users a direct command for the question “what merged where?” while keeping the deeper audit commands available.

Implementation

forkpress branch history and forkpress branch tree route through the existing merge-audit machinery with records=runs, scope=all, and no conflict filters.

The PHP audit backend now accepts --records runs and rejects incompatible filters the same way it does for rollback/crash-only record sets.

Testing instructions

php -l scripts/cow/merge.php
php -l tests/cow/stale_audit.php
php tests/cow/stale_audit.php
cargo fmt --check
FORKPRESS_RUNTIME_BUNDLE=/dev/null cargo test -p forkpress-cli branch_history -- --nocapture
FORKPRESS_RUNTIME_BUNDLE=/dev/null cargo test -p forkpress-cli branch_help_lists_review_revalidation_command -- --nocapture

@adamziel adamziel force-pushed the codex/merge-history-tree branch from c97048a to a39f4a6 Compare May 18, 2026 13:29
@adamziel adamziel force-pushed the codex/merge-history-tree branch from a39f4a6 to 861e055 Compare May 18, 2026 13:59
@adamziel adamziel merged commit 14e24f9 into trunk May 18, 2026
@adamziel adamziel mentioned this pull request May 18, 2026
adamziel added a commit that referenced this pull request May 18, 2026
## Release `v0.1.35`

Version bump and release metadata update for `v0.1.35`.

**Changelog draft:**
* Extend merge revalidation and WordPress semantic guards
([#313](#313))
* Add Events Calendar-shaped merge smoke coverage
([#318](#318))
* Extend semantic E2E with Site Editor objects
([#317](#317))
* Add thin SSH remote clone command
([#315](#315))
* Update release gate evidence for v0.1.34
([#319](#319))
* Guard plugin children behind logical identity collisions
([#320](#320))
* Hold case-insensitive upload path collisions
([#322](#322))
* Cover scoped crash recovery
([#323](#323))
* Hold malformed attachment metadata shapes
([#324](#324))
* Cover thin remote clone branch metadata
([#326](#326))
* Cover source-added trigger view dependencies
([#321](#321))
* Cover WooCommerce duplicate address semantics
([#325](#325))
* Cover Events Calendar organizer validator semantics
([#327](#327))
* Cover Elementor widget media validator semantics
([#328](#328))
* Reject duplicate attachment upload metadata rows
([#329](#329))
* Cover existing branch Git update crash recovery
([#330](#330))
* Mark WordPress media repairs review-only
([#331](#331))
* Cover backup attachment metadata drift
([#332](#332))
* Limit release verification for COW-only PRs
([#335](#335))
* Batch merge reliability roadmap coverage
([#336](#336))
* Cover WordPress upload MIME drift
([#333](#333))
* Add branch merge history commands
([#334](#334))
* Show restored stale-audit reviews
([#337](#337))
* Cover Yoast duplicate indexable permalinks
([#338](#338))
* Cover Yoast indexable hierarchy drift
([#339](#339))
* Cover revision parent semantic drift
([#340](#340))
* Expose merge history in branch switcher
([#341](#341))
* Cover ACF relationship validator drift
([#342](#342))
* Show merge history on branch admin page
([#343](#343))
* Drill into conflicts from branch admin history
([#344](#344))
* Expose branch tree on admin page
([#345](#345))
* Resolve conflicts from branch admin page
([#346](#346))
* Document conflict review workflow
([#347](#347))

**Full changelog:**
v0.1.34...release/v0.1.35

## Next steps

1. **Review** the changes in this pull request.
2. **Push** any additional edits to this branch (`release/v0.1.35`).
3. **Merge** this pull request to publish `v0.1.35`.

Merging will automatically build ForkPress binaries, create a GitHub
release, and update the Homebrew formula.

Co-authored-by: Codex <codex@openai.com>
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.

2 participants