RubyMine provides a visual tool for resolving merge conflicts locally.

Rails professionals since 2007

Our laser focus on a single technology has made us a leader in this space. Need help?

• We build a solid first version of your product
• We train your development team
• We rescue your project in trouble

Read more Show archive.org snapshot

Follow

Git > Resolve Conflicts

in the context menu to open RubyMine's merge conflict tool.

• Left pane: local copy (read-only)
• Right pane: checked in version from repository (read-only)
• Central pane: base revision from which both conflicting versions are derived

You can also use a similar pane view to compare to files.
Mark two files and press Ctrl + D to compare.