Cover conflict resolution matrix in e2e#35

Merged

Phlogistique merged 24 commits into

mainfrom

test-conflict-resolution-matrix

Jun 1, 2026

Commits on May 29, 2026

Push the base-branch merge before asking for conflict resolution

Phlogistique
and
claude
committed
Merge branch 'main' into push-base-merge-before-conflict-comment
Phlogistique
authored
Re-sync the local branch in the conflict comment; fold coverage into e2e

Phlogistique
and
claude
committed

Commits on Jun 1, 2026

Exercise conflict comments for sibling e2e resolutions
Phlogistique
committed
Address review: ordering note, recipe and lookup cleanups

Phlogistique
and
claude
committed
Apply suggestion from @Phlogistique
Phlogistique
authored
Apply suggestions from code review
Phlogistique
authored
Cover conflict resolution matrix in e2e
Phlogistique
committed
Merge PR #33 updates into conflict matrix branch
Phlogistique
committed
Match e2e workflow runs by pull request action
Phlogistique
committed
Make e2e workflow run names matchable
Phlogistique
committed
Drop --ff-only from the conflict-resolution recipe

Phlogistique
and
claude
committed
Merge branch 'push-base-merge-before-conflict-comment' into test-conflict-resolution-matrix
Phlogistique
committed
Drop the tautological git-pull assertion from the e2e helper

Phlogistique
and
claude
committed
Merge remote-tracking branch 'origin/push-base-merge-before-conflict-comment' into test-conflict-resolution-matrix
Phlogistique
committed
Merge updates from main and squash commit
github-actions
committed
Apply suggestion from @Phlogistique
Phlogistique
authored
Apply suggestion from @Phlogistique
Phlogistique
authored
Apply suggestion from @Phlogistique

Phlogistique
and
claude
committed
Address review: faithful conflict resolution, run-name matching, e2e helpers

Phlogistique
and
claude
committed
Read GitHub App private key from the environment again

Phlogistique
and
claude
committed
Read the GitHub App private key from the environment

Phlogistique
and
claude
committed
Merge read-private-key-from-env into conflict matrix branch
Phlogistique
committed
Merge updates from main and squash commit
github-actions
committed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cover conflict resolution matrix in e2e#35

Cover conflict resolution matrix in e2e#35
Phlogistique merged 24 commits into
mainfrom
test-conflict-resolution-matrix

Commits on May 29, 2026

Push the base-branch merge before asking for conflict resolution

Merge branch 'main' into push-base-merge-before-conflict-comment

Re-sync the local branch in the conflict comment; fold coverage into e2e

Commits on Jun 1, 2026

Exercise conflict comments for sibling e2e resolutions

Address review: ordering note, recipe and lookup cleanups

Apply suggestion from @Phlogistique

Apply suggestions from code review

Cover conflict resolution matrix in e2e

Merge PR #33 updates into conflict matrix branch

Match e2e workflow runs by pull request action

Make e2e workflow run names matchable

Drop --ff-only from the conflict-resolution recipe

Merge branch 'push-base-merge-before-conflict-comment' into test-conflict-resolution-matrix

Drop the tautological git-pull assertion from the e2e helper

Merge remote-tracking branch 'origin/push-base-merge-before-conflict-comment' into test-conflict-resolution-matrix

Merge updates from main and squash commit

Apply suggestion from @Phlogistique

Apply suggestion from @Phlogistique

Apply suggestion from @Phlogistique

Address review: faithful conflict resolution, run-name matching, e2e helpers

Read GitHub App private key from the environment again

Read the GitHub App private key from the environment

Merge read-private-key-from-env into conflict matrix branch

Merge updates from main and squash commit