What is Git Conflict?

Git Conflict focuses on resolving Git merge conflicts directly within IntelliJ-based IDEs. It is catalogued under Other dev tools on PulseGate.

Who should use Git Conflict?

Git Conflict is a B2B product built for developers using IntelliJ-based IDEs.

Does Git Conflict have a free plan?

Yes — Git Conflict is free to use.

What platforms does Git Conflict run on?

Git Conflict runs on the web, macOS, Windows, and Linux.

Is Git Conflict still maintained?

Unverified. Git Conflict has not been re-checked since it entered the index, so there is no finding either way — and only a positive finding would say otherwise.

What projects are similar to Git Conflict?

Similar projects tracked by PulseGate include Git, Git Machete, and Git Bar.

Who develops Git Conflict?

Git Conflict is developed by JetBrains.

When did Git Conflict launch?

Git Conflict first shipped in 2025.

Back to the index

Git Conflict

Name: Git Conflict
Author: JetBrains

jetbrains.comOther dev tools

Git Conflict is a plugin for IntelliJ-based IDEs that helps developers inspect and resolve Git merge conflicts within their development environment. It is intended for software developers working with Git repositories.

FreeWebmacOSWindowsLinux

Visit jetbrains.com

Overview

4 features

In the Other dev tools space, Git Conflict takes a focused approach. It focuses on resolving Git merge conflicts directly within IntelliJ-based IDEs. Git Conflict is a B2B product aimed at developers using IntelliJ-based IDEs. It is available for free. It runs on the web, macOS, Windows, and Linux.

JetBrains builds and maintains Git Conflict, and it first shipped in 2025. Key capabilities include conflict resolution, merge conflict view, and git integration.

Summary written by a language model from the project’s public pages.

Conflict resolution
Merge conflict view
Git integration
IDE workflow

Built with & integrations

Hosting

AWS

Connectors

vscode

Runs on

BrowsermacOSWindowsLinux

Detected from

AWS: x-amz-cf-id header · x-amz-cf-pop header · via header

Trust & compliance

Verified signals

HTTPSFree tier

Indexing history

What PulseGate has recorded for this listing

Indexed7 Sept · 13:15 UTC
Git Conflict verified via JetBrains Plugins
Source: JetBrains Plugins · Open

Frequently asked questions about Git Conflict

What is Git Conflict?: Git Conflict focuses on resolving Git merge conflicts directly within IntelliJ-based IDEs. It is catalogued under Other dev tools on PulseGate.
Who should use Git Conflict?: Git Conflict is a B2B product built for developers using IntelliJ-based IDEs.
Does Git Conflict have a free plan?: Yes — Git Conflict is free to use.
What platforms does Git Conflict run on?: Git Conflict runs on the web, macOS, Windows, and Linux.
Is Git Conflict still maintained?: Unverified. Git Conflict has not been re-checked since it entered the index, so there is no finding either way — and only a positive finding would say otherwise.
What projects are similar to Git Conflict?: Similar projects tracked by PulseGate include Git, Git Machete, and Git Bar.Git Git Machete Git Bar
Who develops Git Conflict?: Git Conflict is developed by JetBrains.
When did Git Conflict launch?: Git Conflict first shipped in 2025.

At a glance

Platforms: Web
Languages: English
Built for: developers using IntelliJ-based IDEs
Model: B2B
Solves: Resolving Git merge conflicts directly within IntelliJ-based IDEs.

Registered as

JetBrains Marketplace: 10656

Developer

JetBrains

Index record

Indexed: 7 Sept 2026
Lifecycle: Alive
Last seen: 7 Sept 2026

Identity audit (13)

Slug: git-conflict-jetbrains-com
Lifecycle state recorded: 7 Sept 2026
Verification state: Indexed for public listing
Listing state: Listed: yes
Index status: Included in index
Latest evidence snapshot: 7 Sept 2026
Timeline basis: Indexed-at chronology. This listing's first-seen date was written by the catalog backfill, not observed here, so it is not treated as a sighting.
Name from: Derived from the project's own page and URL.
Category from: Assigned by a language model.
Summary from: Written by a language model from public pages.
Languages from: Detected by a language model from page content.
Last updated: 7 Sept 2026
Canonical URL: https://plugins.jetbrains.com/plugin/10656-git-conflict

Ship this? Send a correction — no account, and you get a link to follow it.

Similar projects

Closest matches by what these projects do