Enhancement Suggestion: Improved Conflict Resolution with Visual Diff Preview

Problem Statement

When conflicts occur during update, pull, or merge in Mendix Studio Pro, the current conflict resolution experience is hard to interpret—especially for complex objects like microflows, pages, and domain models.

While conflicts are detected, developers cannot clearly see:

• What changed in the local version
• What changed in the incoming version
• How the final outcome will look before resolving

This often leads to guesswork, trial‑and‑error, or accidentally losing valid changes.

Proposed Improvement

Introduce a visual “Before / After” diff preview during conflict resolution.

How This Could Work

When a conflict is detected, Studio Pro should provide:

• A side‑by‑side (or three‑way) visual diff view:
  • Base version
  • Local changes
  • Incoming changes
• Clear visual highlights:
  • Added elements
  • Modified elements
  • Removed elements
• Support for core objects:
  • Microflows
  • Pages
  • Entities / Domain model
• Ability to make an informed choice before resolving:
  • Accept local
  • Accept incoming
  • Or manually merge with confidence

Example:

If two developers modify the same microflow (one adds validation, another adds logging), the diff view should clearly show both changes so they can be retained instead of one being overwritten.