{"slug": "p4merge", "name": "p4merge", "category": "other", "category_name": "Other software", "description": "", "recommenders": 3, "commenters": 3, "warners": 0, "score": 2.846, "rising": 1.67, "first": "2026-03-22", "latest": "2026-10-13", "why": "", "why_is_quote": false, "has_verdict": false, "sentiment": {"recommend": 2, "neutral": 1, "compare": 0, "warn": 0}, "spark": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2], "listed": true, "loved": [], "caveat": "", "short_quote": "", "kind": "", "icon": true, "domain": null, "github_repo": null, "official_url": "https://www.perforce.com/products/helix-core-apps/merge-diff-tool-p4merge", "pricing": "", "aliases": ["p4merge"], "verdict": null, "praise": [{"label": "", "summary": "", "quotes": [{"id": 801231937, "item_id": 50076996, "url": "https://news.ycombinator.com/item?id=50076996", "by": "pyrolistical", "date": "2026-10-13", "version": null, "stance": "recommend", "quote": "the p4merge tool was GOAT", "excerpt": "Perforce was fine. It just had a terrible ui and didn\u2019t allow me to code on the beach. If I were still manually merging conflicts the p4merge tool was GOAT I used it in git", "context": "", "use_case": "merging conflicts", "switched_from": "", "story": "Redesigning source control at Anthropic"}]}], "caveats": [], "who": [], "tags": [], "use_cases": ["merge tool", "merge conflict tool", "merging conflicts"], "compared": [{"slug": "visual-studio-code", "name": "Visual Studio Code", "co": 1, "switched_from": 0, "switched_to": 1}, {"slug": "git", "name": "Git", "co": 3, "switched_from": 0, "switched_to": 0}, {"slug": "perforce", "name": "Perforce", "co": 2, "switched_from": 0, "switched_to": 0}], "makers": [], "threads": [{"url": "https://news.ycombinator.com/item?id=50073633", "title": "Redesigning source control at Anthropic", "mentions": 2}, {"url": "https://news.ycombinator.com/item?id=47478401", "title": "A Coherent Vision for the Future of Version Control", "mentions": 2}], "sentiment_by_month": {"2025-11": {}, "2025-12": {}, "2026-01": {}, "2026-02": {}, "2026-03": {"neutral": 1}, "2026-04": {}, "2026-05": {}, "2026-06": {}, "2026-07": {}, "2026-08": {}, "2026-09": {}, "2026-10": {"recommend": 2}}, "versions": [], "version_unnamed": 0, "quotes": [{"id": 801260753, "item_id": 50078797, "url": "https://news.ycombinator.com/item?id=50078797", "by": "dingaling911", "date": "2026-10-13", "version": null, "stance": "recommend", "quote": "", "excerpt": "https://git-scm.com/docs/git-p4", "context": "", "use_case": "Merge conflict tool", "switched_from": "", "story": "Redesigning source control at Anthropic"}, {"id": 801231937, "item_id": 50076996, "url": "https://news.ycombinator.com/item?id=50076996", "by": "pyrolistical", "date": "2026-10-13", "version": null, "stance": "recommend", "quote": "the p4merge tool was GOAT", "excerpt": "Perforce was fine. It just had a terrible ui and didn\u2019t allow me to code on the beach. If I were still manually merging conflicts the p4merge tool was GOAT I used it in git", "context": "", "use_case": "merging conflicts", "switched_from": "", "story": "Redesigning source control at Anthropic"}, {"id": 759685616, "item_id": 47480351, "url": "https://news.ycombinator.com/item?id=47480351", "by": "roryokane", "date": "2026-03-22", "version": null, "stance": "recommend", "quote": "", "excerpt": "Even if you don\u2019t use p4merge, you can set Git\u2019s merge.conflictStyle config to \"diff3\" or \"zdiff3\" (https://git-scm.com/docs/git-config#Documentation/git-config.txt-mergeconflictStyle). If you do that, Git\u2019s conflict markers show the base version as well: <<<<<<< left ||||||| base def calculate(x): a = x * 2 b = a + 1 return b ======= def calculate(x): a = x * 2 logger.debug(f\"a={a}\") b = a + 1 return b >>>>>>> right", "context": "", "use_case": "Merge tool", "switched_from": "", "story": "A Coherent Vision for the Future of Version Control"}, {"id": 759684513, "item_id": 47480282, "url": "https://news.ycombinator.com/item?id=47480282", "by": "roryokane", "date": "2026-03-22", "version": null, "stance": "neutral", "quote": "I used p4merge as my merge tool for a long time", "excerpt": "Did you know that VS Code added support for the same four-pane view as p4merge years ago? I used p4merge as my merge tool for a long time, but I switched to VS Code when I discovered that, as VS Code\u2019s syntax highlighting and text editing features are much better than p4merge\u2019s. I also use the merge tool of JetBrains IDEs such as IntelliJ IDEA (https://www.jetbrains.com/help/idea/resolve-conflicts.html#resolve-confli", "context": "", "use_case": "merge tool", "switched_from": "", "story": "A Coherent Vision for the Future of Version Control"}]}