FEATURE: Integrate conflict resolution with publish/discard dialog workflow#3769

Merged

mhsdesign merged 24 commits into9.0from feature/conflict-resolution-03/rebase-during-publish

Oct 29, 2024

+871-357

Commits on Jun 28, 2024

TASK: Move Conflicts concept to Application\Shared namespace
grebaldi
committed
TASK: Add command handlers for all Publish-related commands
grebaldi
committed
TASK: Ensure that all Publish-related command handlers throw ConflictsOccurred
grebaldi
committed
TASK: Turn ConflictsOccurred into a Result DTO rather than an exception
grebaldi
committed
TASK: Move logic to create Conflicts from WorkspaceRebaseFailed into dedicated Factory
grebaldi
committed
TASK: Use conflict DTO key property as key for iteration in ConflictList component
grebaldi
committed
TASK: Trigger conflict resolution from within Publish saga
grebaldi
committed
BUGFIX: Remove race condition in watchNodeInformationChanges
grebaldi
committed
BUGFIX: Wait and reload before syncing in E2E test
grebaldi
committed
TASK: Stabilize E2E tests for synving feature
grebaldi
committed
BUGFIX: Fix undefined state when cancelling sync operations
grebaldi
committed
TASK: Handle edge case when automatic syncing during "publish document" removes the document
grebaldi
committed

Commits on Sep 30, 2024

Commits on Oct 17, 2024

Commits on Oct 26, 2024

Merge remote-tracking branch 'origin/9.0' into feature/conflict-resolution-03/rebase-during-publish
mhsdesign
committed

Commits on Oct 27, 2024

Commits on Oct 28, 2024

Commits on Oct 29, 2024

Merge remote-tracking branch 'origin/9.0' into feature/conflict-resolution-03/rebase-during-publish
mhsdesign
committed