Merge conflict resolve tool for Sublime IDE?

Question

I'm currently using Sublime text editor with a Brightscript plugin to code with. When it comes to resolve merge conflicts, is there a free tool to use to more easily resolve conflicts?

If not, is there another IDE I could that would have such a tool?

namlu · Answer

I've just tried the following:https://github.com/DougTy/sublime-compare-side-by-sideand&nbsp;https://github.com/colinta/SublimeFileDiffsNot very clear how they work as they seem to open the diffs in a seperate tab.

Forum Discussion

Merge conflict resolve tool for Sublime IDE?

1 Reply

Recent Discussions

Free Tools for Roku Content Preparation - Built by Fellow Indie Publisher

Developer Rev Share column in Sales Activity Report

MultiStyleLabel aligning right issue

OS 15.1.4 query/media-player Expired

Proper Roku Pay API