Viewing conflicts unresolvable remotely

Description

Recently the possibility to resolve some conflicts remotely has been added, but those that can't merely get a shrug to resolve them locally, without a hint at what the conflicts are, and how much work this will entail. To know this, one has to "start work" (however small) on the CLI that is expected to possibly be postponed because the scope of the conflict could be larger than anticipated, creating some frustration.

Proposal

Add a way to preview the conflicts (but not resolve them) remotely so as to assess how much work will be needed even before going back to CLI.

Edited Sep 02, 2020 by 🤖 GitLab Bot 🤖
Assignee Loading
Time tracking Loading