Skip to content

Add psalm - #1249

Open
RomainLvr wants to merge 2 commits into
fix/massive-action-custom-asset-dropdown-fieldsfrom
add/psalm-configuration
Open

Add psalm#1249
RomainLvr wants to merge 2 commits into
fix/massive-action-custom-asset-dropdown-fieldsfrom
add/psalm-configuration

Conversation

@RomainLvr

Copy link
Copy Markdown
Contributor

No description provided.

@RomainLvr
RomainLvr requested a review from Rom1-B August 21, 2026 09:42
@RomainLvr RomainLvr self-assigned this Aug 21, 2026

@Rom1-B Rom1-B left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR can target “main” directly, which allows it to be merged quickly, but it will require rebasing the other 12 pending PRs...

@RomainLvr

Copy link
Copy Markdown
Contributor Author

This PR can target “main” directly, which allows it to be merged quickly, but it will require rebasing the other 12 pending PRs...

Going back to the main branch won’t make much difference; the changes will be applied in any case once 1247 is merged, which shouldn’t be long now given that the review has been completed and the suggestions have been implemented.
I just wanted to test GitHub’s new Stack system :)

@RomainLvr
RomainLvr requested a review from Rom1-B August 21, 2026 11:20
@Rom1-B

Rom1-B commented Aug 21, 2026

Copy link
Copy Markdown
Contributor

Even landing eventually isn't the same as landing as its own commit: stacking it on another PR means it gets squashed into that branch's commit instead of showing up separately in main's history. Could you retarget this to main directly instead of playing with the Stack feature?

@RomainLvr

Copy link
Copy Markdown
Contributor Author

Even landing eventually isn't the same as landing as its own commit: stacking it on another PR means it gets squashed into that branch's commit instead of showing up separately in main's history. Could you retarget this to main directly instead of playing with the Stack feature?

I don't think that's how GitHub's new Stacked PR feature works.

The child PR remains a separate PR and can be merged independently. If #1247 is merged first, #1249 is then retargeted onto main, and its changes can still be merged separately.

So stacking doesn't mean that #1249 is automatically squashed into #1247's commit or that it disappears from main's history. The final history still depends on the merge method chosen for each PR.

Since #1247 is already reviewed and almost ready to merge, I don't see a downside to keeping #1249 stacked on it. It also lets us review #1249 independently without having to rebase the other 12 pending PRs.

We will have to use the second option for merging :
image

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