Roku Developer Program

Developers and content creators—a complete solution for growing an audience directly.
Showing results for 
Show  only  | Search instead for 
Did you mean: 
Level 7

Merge conflict resolve tool for Sublime IDE?

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?
0 Kudos
1 Reply
Level 7

Re: Merge conflict resolve tool for Sublime IDE?

I've just tried the following:


Not very clear how they work as they seem to open the diffs in a seperate tab.
0 Kudos