sourcegit icon indicating copy to clipboard operation
sourcegit copied to clipboard
verified publisher icon sourcegit-scm

[feature suggestion] Integrated merge-tool

Open wl2776 opened this issue 11 months ago • 3 comments

It seems logical to display conflicts in SourceGit and allow users to resolve them instead of sending to 3rd-party tools.

image

I've started looking into this task. However, since I have very little experience in .net, the progress is rather slow.

wl2776 avatar Jan 10 '25 12:01 wl2776

What is the current state of this? I understand that @wl2776 has started work on this, meanwhile @love-linger also has this issue assigned.

Doodeletion avatar Feb 10 '25 14:02 Doodeletion

What is the current state of this? I understand that @wl2776 has started work on this, meanwhile @love-linger also has this issue assigned.

No progress on my side.

wl2776 avatar Feb 10 '25 14:02 wl2776

Thanks for the quick update!

Doodeletion avatar Feb 10 '25 15:02 Doodeletion