Use the web IDE to resolve merge conflicts

Everyone can contribute. Help move this issue forward while earning points, leveling up and collecting rewards.

• Close this issue

Proposal

The current UI for merging conflicts can be confusing and the ability to include "both" is not yet available.

This proposal suggests the use of the Web IDE to be the interface for managing merge conflicts.

Originally suggested in #360807 (comment 2308872876)