-
-
Notifications
You must be signed in to change notification settings - Fork 134
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
!!!FEATURE: Offer resolution strategies when conflicts arise during rebase #3762
Commits on Apr 25, 2024
-
TASK: Use WorkspaceStatus type for workspace status state, let it def…
…ault to UP_TO_DATE
Configuration menu - View commit details
-
Copy full SHA for 4cbf010 - Browse repository at this point
Copy the full SHA 4cbf010View commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for 10b44ee - Browse repository at this point
Copy the full SHA 10b44eeView commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for 84eafcf - Browse repository at this point
Copy the full SHA 84eafcfView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2439f5a - Browse repository at this point
Copy the full SHA 2439f5aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3cb3871 - Browse repository at this point
Copy the full SHA 3cb3871View commit details -
Configuration menu - View commit details
-
Copy full SHA for 74ba34b - Browse repository at this point
Copy the full SHA 74ba34bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 46f1bfb - Browse repository at this point
Copy the full SHA 46f1bfbView commit details -
Configuration menu - View commit details
-
Copy full SHA for f834747 - Browse repository at this point
Copy the full SHA f834747View commit details -
Configuration menu - View commit details
-
Copy full SHA for 49719ea - Browse repository at this point
Copy the full SHA 49719eaView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3ccdba6 - Browse repository at this point
Copy the full SHA 3ccdba6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8db3bf8 - Browse repository at this point
Copy the full SHA 8db3bf8View commit details -
Configuration menu - View commit details
-
Copy full SHA for acb76ba - Browse repository at this point
Copy the full SHA acb76baView commit details -
Configuration menu - View commit details
-
Copy full SHA for af8f830 - Browse repository at this point
Copy the full SHA af8f830View commit details -
Configuration menu - View commit details
-
Copy full SHA for d93f8c3 - Browse repository at this point
Copy the full SHA d93f8c3View commit details -
Configuration menu - View commit details
-
Copy full SHA for 81d01be - Browse repository at this point
Copy the full SHA 81d01beView commit details -
Configuration menu - View commit details
-
Copy full SHA for c24e9ac - Browse repository at this point
Copy the full SHA c24e9acView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0e0aef0 - Browse repository at this point
Copy the full SHA 0e0aef0View commit details -
Configuration menu - View commit details
-
Copy full SHA for c2c0a41 - Browse repository at this point
Copy the full SHA c2c0a41View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8d7f0bd - Browse repository at this point
Copy the full SHA 8d7f0bdView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3f2bb45 - Browse repository at this point
Copy the full SHA 3f2bb45View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2b1cd02 - Browse repository at this point
Copy the full SHA 2b1cd02View commit details -
Configuration menu - View commit details
-
Copy full SHA for 018671f - Browse repository at this point
Copy the full SHA 018671fView commit details -
TASK: Create E2E test scenario for conflict resolution with "Drop con…
…flicting changes" strategy
Configuration menu - View commit details
-
Copy full SHA for 6627a53 - Browse repository at this point
Copy the full SHA 6627a53View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6bc82a5 - Browse repository at this point
Copy the full SHA 6bc82a5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5b383c1 - Browse repository at this point
Copy the full SHA 5b383c1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 18c7da9 - Browse repository at this point
Copy the full SHA 18c7da9View commit details -
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
Configuration menu - View commit details
-
Copy full SHA for f3ac501 - Browse repository at this point
Copy the full SHA f3ac501View commit details
Commits on Apr 26, 2024
-
Configuration menu - View commit details
-
Copy full SHA for b8d7d03 - Browse repository at this point
Copy the full SHA b8d7d03View commit details
Commits on Apr 29, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 8d2d1cb - Browse repository at this point
Copy the full SHA 8d2d1cbView commit details