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

!!!FEATURE: Offer resolution strategies when conflicts arise during rebase #3762

Merged
merged 29 commits into from
May 13, 2024

Commits on Apr 25, 2024

  1. Configuration menu
    Copy the full SHA
    4cbf010 View commit details
    Browse the repository at this point in the history
  2. TASK: Use Neos.Neos high-level Workspace API for WorkspaceInfo

    This includes a new data-point `totalNumberOfChanges` which gives us the
    number of all changes in the workspace (as opposed to just the changes
    per-site or per-document). This is needed to inform the `DISCARD_ALL`
    strategy during rebase.
    grebaldi committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    10b44ee View commit details
    Browse the repository at this point in the history
  3. TASK: Create backend mechanism to collect information about rebase co…

    …nflicts
    
    Conflicts are generated from the CR-side `WorkspaceRebaseFailed` exception.
    
    A conflict consists of a `TypeOfChange` (generated from the original CR
    command that failed) and a `ReasonForConflict` (generated from the
    exception that was the cause for the command to fail). It also contains
    information about the affected node, the associated document and the
    associated site.
    
    Conflicts are squashed. Only the first conflict per NodeAggregateId will
    be registered. This is to reduce visual redundancy, as UI users do not
    need to know about every single failed constraint check. They only need
    to understand what change they are going to lose, if they're choosing a
    destructive action to resolve the rebase conflicts.
    
    Also:
    The SyncWorkspace command has been moved to a dedicated namespace within the
    Application layer. The `rebaseWorkspace` action has been renamed to
    `syncWorkspace` everywhere to improve naming consistency.
    grebaldi committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    84eafcf View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2439f5a View commit details
    Browse the repository at this point in the history
  5. TASK: Create Sync saga

    grebaldi committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    3cb3871 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    74ba34b View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    46f1bfb View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    f834747 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    49719ea View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    3ccdba6 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    8db3bf8 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    acb76ba View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    af8f830 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    d93f8c3 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    81d01be View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    c24e9ac View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    0e0aef0 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    c2c0a41 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    8d7f0bd View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    3f2bb45 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    2b1cd02 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    018671f View commit details
    Browse the repository at this point in the history
  23. TASK: Create E2E test scenario for conflict resolution with "Drop con…

    …flicting changes" strategy
    grebaldi committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    6627a53 View commit details
    Browse the repository at this point in the history
  24. TASK: Stabilize E2E tests

    grebaldi committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    6bc82a5 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    5b383c1 View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    18c7da9 View commit details
    Browse the repository at this point in the history
  27. TASK: Remove obsolete i18n labels

    Namely:
    
    Neos.Neos.Ui:Main:workspaceSynchronizationApplied
    Neos.Neos.Ui:Main:syncPersonalWorkSpaceConfirm
    Neos.Neos.Ui:Main:syncPersonalWorkSpaceMessage
    Neos.Neos.Ui:Main:syncPersonalWorkSpaceMessageOutdated
    Neos.Neos.Ui:Main:syncPersonalWorkSpaceMessageOutdatedConflict
    grebaldi committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    f3ac501 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. Configuration menu
    Copy the full SHA
    b8d7d03 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. Configuration menu
    Copy the full SHA
    8d2d1cb View commit details
    Browse the repository at this point in the history