Skip to content

[feature suggestion] Integrated merge-tool #892

Open
@wl2776

Description

@wl2776

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.

Metadata

Metadata

Assignees

Labels

enhancementNew feature or request

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions