[DRAFT] Discussion: Improving merge conflict management in Source Code

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

• Close this issue

Dealing with merge conflicts can be an extremely painful part of the development process that can lead to frustration, loss of time, and loss of work for users.

Merge conflict management was cited under the major theme of things "not working as expected" in Gitlab during the August 2024 SUS Survey.

This issue will be used as a place to explore: What are ways GitLab can help users manage merge conflicts?