dolt-workbench icon indicating copy to clipboard operation
dolt-workbench copied to clipboard
verified publisher icon dolthub

Workflow/UI for merge conflicts

Open silldr1 opened this issue 8 months ago • 1 comments

Create a workflow for merge conflicts when pulling changes

silldr1 avatar Apr 18 '25 21:04 silldr1

Currently, when you try to merge a "PR" with conflicts you get this:

Image

A UI here would be great and could be resued in Hosted and potentially DoltHub/DoltLab.

timsehn avatar Apr 18 '25 21:04 timsehn