RubyMine provides a visual tool for resolving merge conflicts locally.

Do you need DevOps-experts?

Your development team has a full backlog? No time for infrastructure architecture? Our DevOps team is ready to support you!

• We build reliable cloud solutions with Infrastructure as code
• We are experts in security, Linux and databases
• We support your dev team to perform

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.