DevOps · JetBrains plugin
Merge Conflict Leftover Companion
FreeVCS / Git Workflow
Flags real Git merge-conflict markers (<<<<<<<, |||||||, =======, >>>>>>>) left behind in any file: a real, distinct problem from an *active* unresolved merge (which the IDE's own Commit window already flags in red): a merge that was already resolved and committed, but with the markers themselves accidentally left in the file. Covers both the standard 3-way conflict style and the diff3/
The gap it fixes
This is a real, recurring mistake — a quick web search for "detect git conflict markers" turns up multiple independent blog posts and CI scripts written specifically to catch this after the fact, confirming it's a known problem, not an imagined one. Nothing in the IDE flags it proactively today.
Facts and pricing
- Category
- DevOps
- Pricing
- Free
- Platform
- IntelliJ-family
- First published
- 2026-08-31
- Marketplace ID
- #33790
- Repository
merge-conflict-leftover-companion- Growth
- New listing
Related plugins
All DevOps pluginsRun React Native commands (run-android, run-ios, Metro) from a tool window without freezing the IDE.
Encrypt and decrypt Ansible Vault (1.1/AES256 format) directly in the editor, without depending on ansible-vault being installed.
Static syntax and structural checks for .gitlab-ci.yml: catch mistakes before running a real pipeline, not after.
Gutter icon on every entry of an open package.json's "scripts" section, showing whether that script is actually referenced anywhere in your project: or an orphan nobody calls, a real candidate for cleanup. 100% static text/PSI analysis of files already open in your project: no Node.js/npm process spawned, no network call.
Download and star counts as of 2026-10-18, refreshed twice daily from the JetBrains Marketplace and GitHub APIs.