Skip to content

test: scratch proof for the keep-pr-current workflow - #3694

Closed
eleshar wants to merge 6 commits into
developfrom
ci/scratch-conflict-proof
Closed

eleshar wants to merge 6 commits into
developfrom
ci/scratch-conflict-proof

Conversation

@eleshar

@eleshar eleshar commented Sep 30, 2026

Copy link
Copy Markdown
Contributor

Scratch branch used only to prove the behaviour of .github/workflows/keep-pr-current.yml from #3693.

Not for merge. Same-repository test branch, opened as a draft, conflicts with develop in FEEDBACK_RESPONSE.md by design (it edits the same line #3689 edited). It will be marked ready once to exercise the ready_for_review trigger, then closed and deleted.

Labels: type:ci, area:ci, priority:minor, status:needs-review.

Linked issues

Relates to #3693, #3574

Checklist (Global DoD / PR)

  • All AC met and demonstrated — n/a, test branch
  • Tests added/updated — n/a, test branch
  • Code/design reviews approved — do not review
  • CI green — n/a, test branch

@coderabbitai

coderabbitai Bot commented Sep 30, 2026 •

Copy link
Copy Markdown
Contributor

Review in Change Stack →

Navigate logical layers of code changes, visualize relationships, and explore their blast radius.

Note

Currently processing new changes in this PR. This may take a few minutes, please wait...

⚙️ Run configuration

Configuration used: Repository: lightspeedwp/.github/.coderabbit.yml

Review profile: CHILL

Plan: Advanced

Run ID: 5070b247-0c7a-43d2-9d8d-731b88590501

📥 Commits

Reviewing files that changed from the base of the PR and between a3a064d and 948c743.

📒 Files selected for processing (3)
  • .github/workflows/keep-pr-current.yml
  • scripts/automation/__tests__/keep-pr-current.test.js
  • scripts/automation/keep-pr-current.cjs
 ________________________________
< NVIDIA inside, Rabbit outside. >
 --------------------------------
  \
   \   (\__/)
       (•ㅅ•)
       /   づ
✨ Finishing Touches
📝 Generate docstrings
  • Commit to this branch
  • Create a new PR
🧪 Generate unit tests (beta)
  • Commit to this branch
  • Create a new PR

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@eleshar
eleshar marked this pull request as ready for review September 30, 2026 06:32
@eleshar
eleshar requested review from a team and ashleyshaw as code owners September 30, 2026 06:32
@qodo-code-review

Copy link
Copy Markdown

ⓘ Qodo reviews are paused because the subscription is no longer active. Ask your workspace admin to reactivate the subscription to resume reviews. Manage billing

@github-actions

github-actions Bot commented Sep 30, 2026 •

Copy link
Copy Markdown
Contributor

No description provided.

@github-actions

Copy link
Copy Markdown
Contributor

AI Feedback Validation Report

❌ No issue link found: the PR must include Resolves #123 or Closes #123.

Required actions

  1. Link this PR to its issue with Resolves #123 or Closes #123 in the description.
  2. Track AI review feedback in FEEDBACK_RESPONSE.md with a status per item.
  3. For deferred feedback, open a follow-up issue and link it.

@github-actions

Copy link
Copy Markdown
Contributor

Pull request #3694 could not be updated automatically

develop cannot be merged into this branch automatically because the two conflict
(mergeable_state: blocked). Merging cannot resolve a conflict, so this needs
a human. This is a property of the branch, not a failure of any check — no check is
reporting red because of it, and the up-to-date requirement on develop is unchanged.

To resolve it:

  1. Merge develop into this branch locally (git merge origin/develop) and push the
    result, or rebase the branch onto develop.
  2. Open the Resolve conflicts view to jump straight to the conflicting files:
    https://github.com/lightspeedwp/.github/pull/3694/conflicts

Common conflict sources in this repository are the per-pull-request files that every
pull request rewrites (FEEDBACK_RESPONSE.md) and the shared [Unreleased] list in
CHANGELOG.md. CHANGELOG.md is union-merged via .gitattributes, so it merges cleanly;
a conflict there means a change larger than an added entry.

Log
#3694 HTTP 422: There are no new commits on the base branch. - https://docs.github.com/rest/pulls/pulls#update-a-pull-request-branch

@eleshar eleshar closed this Sep 30, 2026
@eleshar eleshar reopened this Sep 30, 2026
@eleshar

eleshar commented Sep 30, 2026

Copy link
Copy Markdown
Contributor Author

Closed: scratch proof branch for #3693. Observed three workflow runs against this PR on 2026-09-30:

  1. updated (HTTP 202) — check success, head advanced, PR became MERGEABLE.
  2. Pre-fix classifier: conflict (HTTP 422, There are no new commits on the base branch.) — posted a false conflict comment twice, on a pull request that was already current. That is the bug fixed in 22ba5c8.
  3. Post-fix classifier: current (HTTP 422, There are no new commits on the base branch.) — no comment posted, check success.

Not a real change; deleting the branch.

@eleshar eleshar closed this Sep 30, 2026
@eleshar
eleshar deleted the ci/scratch-conflict-proof branch September 30, 2026 06:36
@ashleyshaw ashleyshaw self-assigned this Sep 30, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants