Add conflict resolution options to workspace settings

[iamrajeshk]

This pull request introduces a new workspace setting that allows users to control how conflicts are handled—either by resolving them or overriding them. The change adds both the frontend UI for this option and the necessary data model and API support.

Workspace conflict handling improvements:

• Added a new UI section in Apps.vue for selecting conflict handling behavior ("Resolve" or "Override") using radio buttons, bound to a new workspaceOverrideConflicts property.
• Introduced the overrideConflicts property to the Workspace and WorkspacePatch TypeScript interfaces to support this setting in the data model. [1] [2]
• Bound the UI value to the workspace model in the component state (workspaceOverrideConflicts ref) and included it in the save operation for workspace configuration. [1] [2]

Task 4129: ASR: Added mode selection settings in Workspaces for Conflict resolution

[coderabbitai]

Important

• 🔍 Trigger review

This repository does not receive automatic reviews because it has fewer than 10 stars.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: ef0dd6f3-5baa-4113-b6ff-8171882ac8cf

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[jeffmaki]

@cyrossignol is going to provide some new copy here, please don't merge until he chimes in. Thanks!