Skip to content
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

Jump to bottom

BUGFIX: Asset usage prevent orphaned asset usage entries in case of a rebase with conflicts #5406

Open
wants to merge 5 commits into
base: 9.0
Choose a base branch
from
Open

BUGFIX: Asset usage prevent orphaned asset usage entries in case of a rebase with conflicts #5406

wants to merge 5 commits into from

Conversation

mhsdesign
Copy link
Member

Upgrade instructions

Review instructions

Checklist

  • Code follows the PSR-2 coding style
  • Tests have been created, run and adjusted as needed
  • The PR is created against the lowest maintained branch
  • Reviewer - PR Title is brief but complete and starts with FEATURE|TASK|BUGFIX
  • Reviewer - The first section explains the change briefly for change-logs
  • Reviewer - Breaking Changes are marked with !!! and have upgrade-instructions

@mhsdesign mhsdesign requested a review from dlubitz December 18, 2024 13:55
@mhsdesign
TASK: Add note why we dont handle WorkspaceWasPublished
00b4895
@mhsdesign
FEATURE: Indicate if a rebase had conflicts
9151383
@mhsdesign
BUGFIX: Asset usage prevent orphaned asset usage entries in case of a…
e7d185c 
… rebase with conflicts
@mhsdesign
TASK: Rename to hasSkippedEvents and store originally conflicting s…
1c4f941 
…equence numbers in force-rebase event

Storing the skipped sequence numbers should ease debugging rather than having 'just' a boolean indicator. The public api does not need to know about that thus the getter.
@mhsdesign
TASK: Inline condition into match call
19cb5c2
@mhsdesign mhsdesign force-pushed the bugfix/orphaned-asset-usage-entries branch from 8d5bc2c to 19cb5c2 Compare January 9, 2025 10:37
dlubitz
dlubitz approved these changes Jan 9, 2025
View reviewed changes
Copy link
Contributor

@dlubitz dlubitz left a comment

Choose a reason for hiding this comment

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

This looks awesome. Thank you

@mhsdesign mhsdesign mentioned this pull request Jan 9, 2025
Open
@dlubitz
Copy link
Contributor

dlubitz commented Jan 17, 2025

@mhsdesign Can we merge this?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dlubitz dlubitz dlubitz approved these changes

At least 2 approving reviews are required to merge this pull request.

Assignees
No one assigned
Labels
9.0 Bug
Projects
Neos 9.0 Release Board
Status: Under Review 👀
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mhsdesign @dlubitz