GUI client software "Sublime Merge" to resolve merge conflicts

■ This is an article posted on June 2019, 8, so the content of the information may be out of date.

GUI client software for resolving merge conflicts on Unipos website Sublime Merge Page has been added.

Sublime Merge Is a text editor Sublime TextIt is a Git client software based on Git that allows you to visually operate Git. Smooth file, hunk, and line stages allow for quick commits.

Side-by-side diff display, tripartite display, syntax highlighting, character-by-character diff display, and flexible workspace display range change by dragging make it easy to understand change history visually Is a feature. You can also search the entire repository by commit message, author, path and content elements. These features allow you to resolve merge conflicts quickly and easily without opening an editor.
It supports multi-platform (64bit) of Windows, Mac OS X and Linux.

Sublime MergeFunctional features:
– Integrated Merge Tool
– Unmatched Performance
– Advanced Diffs
– Command Palette and Key Bindings
– Extensibility
– Command Line Integration
– Powerful Search
– Blame
– File and Hunk History
– Light and Dark Themes
–Syntax Highlighting