Skip to content

Improve resolving non-textual and submodule merge conflicts - #5735

Merged
stefanhaller merged 6 commits into
masterfrom
submodule-conflicts
Jun 28, 2026
Merged

Improve resolving non-textual and submodule merge conflicts#5735
stefanhaller merged 6 commits into
masterfrom
submodule-conflicts

Extract per-case render helpers from FilesController.GetOnRenderToMain

71a6396
Select commit
Loading
Failed to load commit list.

Select a check to view from the sidebar