FlexMeasures / flexmeasures / 36915869925
86%

DEFAULT BRANCH: main
Ran
Jobs 1
Files 188
Run time 1min
Badge
Embed ▾
README BADGES
x

If you need to use a raster PNG badge, change the '.svg' to '.png' in the link

Markdown

Textile

RDoc

HTML

Rst
coverage: 86.273%. Remained the same
36915869925

push

github

web-flow 
Guard stacked PRs from silent closure when deleting merged base branches (#2633)

* Initial plan

* instructions/feature-branch-sync: guard branch deletion for stacked PRs

Context:
- Merging with --delete-branch can silently close open PRs targeting that base branch.

Change:
- Added a pre-delete check with gh pr list and explicit guidance to skip --delete-branch when dependents exist.
- Added recovery order for accidentally closed stacked PRs: restore base branch, then reopen.

Co-authored-by: Flix6x <30658763+Flix6x@users.noreply.github.com>

* docs/changelog: note stacked PR branch-deletion safeguard

Context:
- Branch-deletion guidance changed for stacked pull requests.

Change:
- Added an Infrastructure/Support changelog item describing the new pre-delete check and why it prevents silent PR closure.

Co-authored-by: Flix6x <30658763+Flix6x@users.noreply.github.com>

* claude/hooks: block gh pr merge with --delete-branch

Context:
- Deleting in the same merge command can race stacked-PR retargeting and close dependent PRs.

Change:
- Added a PreToolUse hook that blocks gh pr merge when --delete-branch is present.
- Registered the hook in .claude/settings.json with a targeted matcher.

Co-authored-by: Flix6x <30658763+Flix6x@users.noreply.github.com>

* instructions/feature-branch-sync: document merge-delete race

Context:
- Follow-up feedback clarified that the failure mode is a race between retargeting and immediate branch deletion.

Change:
- Updated the branch-deletion guidance to require merging without --delete-branch, checking dependent PRs, and deleting only after the base has no dependents.
- Updated the changelog entry to reflect this refined guidance and the new Claude guard hook.

Co-authored-by: Flix6x <30658763+Flix6x@users.noreply.github.com>

* The guard missed the short spelling of --delete-branch

`-d` is the documented short form of `--delete-branch` on `gh pr merge`, and pflag bundles short booleans, so `-sd` and `-ds` say the ... (continued)

20834 of 24149 relevant lines covered (86.27%)

0.86 hits per line

Jobs
ID Job ID Ran Files Coverage
1 36915869925.1 188
86.27
GitHub Action Run
Source Files on build 36915869925