3 ms·
> The central pane is a fully-functional editor where the results of resolving conflicts are displayed. Initially, the contents of this pane are the same as the
by taspeotis 4y ago
> The central pane is a fully-functional editor where the results of resolving conflicts are displayed. Initially, the contents of this pane are the same as the base revision of the file, that is, the revision from which both conflicting versions are derived.
https://www.jetbrains.com/help/rider/Resolve_conflicts.html https://www.jetbrains.com/help/rider/Resolve_conflicts.html