It seems logical to display conflicts in SourceGit and allow users to resolve them instead of sending to 3rd-party tools.  I've started looking into this task. However, since I have very little experience in .net, the progress is rather slow.