Help

Roku Developer Program

Join our online forum to talk to Roku developers and fellow channel creators. Ask questions, share tips with the community, and find helpful resources.
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Show  only  | Search instead for 
Did you mean: 
namlu
Visitor
‎10-16-2018 05:44 PM

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
Reply
1 REPLY 1
namlu
Visitor
‎10-16-2018 06:23 PM

Re: Merge conflict resolve tool for Sublime IDE?

I've just tried the following:
https://github.com/DougTy/sublime-compare-side-by-side

and 

https://github.com/colinta/SublimeFileDiffs

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