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.

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

Remove WorkspaceStatus::OUTDATED_CONFLICT? #5101

Open
mhsdesign opened this issue May 27, 2024 · 1 comment · May be fixed by #5143
Open

Remove WorkspaceStatus::OUTDATED_CONFLICT? #5101

mhsdesign opened this issue May 27, 2024 · 1 comment · May be fixed by #5143
Labels

Comments

@mhsdesign
Copy link
Member

What happens with \Neos\ContentRepository\Core\Projection\Workspace\WorkspaceStatus::OUTDATED_CONFLICT the doc comment is now at least outdated and we never use it anymore besides writing for legacy event but we never query those?

So can we get rid of this status ?

Originally posted by @mhsdesign in #4965 (comment)

@mhsdesign mhsdesign added the 9.0 label May 27, 2024
mhsdesign added a commit to mhsdesign/neos-development-collection that referenced this issue Jun 16, 2024
@mhsdesign mhsdesign linked a pull request Jun 16, 2024 that will close this issue
6 tasks
@mhsdesign
Copy link
Member Author

mhsdesign commented Oct 3, 2024

Also we dont need the REBASE_ERROR any further and the docs are outdated:

as well as this comment here too:
* This strategy rebasing will fail if conflicts are detected and the "WorkspaceRebaseFailed" event is added.

Also some adjusted tests where not really testing that what they stated, this will be adjusted via: #5274

  • Conflicting changes lead to OUTDATED_CONFLICT which can be recovered from via forced rebase
  • Conflicting changes lead to OUTDATED which can be recovered from via discard

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: No status
Development

Successfully merging a pull request may close this issue.

1 participant