Cover conflict resolution matrix in e2e #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Phlogistique merged 24 commits into main from test-conflict-resolution-matrix

Jun 1, 2026

.github/workflows/update-pr-stack.yml

-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
     name: Update PR Stack
+    run-name: "${{ github.event.action }} PR #${{ github.event.pull_request.number }} - ${{ github.event.pull_request.title }}"
     on:
       pull_request:
@@ Expand Down @@