--- title: "How To Enable Real-Time Merge Conflict Detection in PhpStorm" url: https://daily.dev/posts/how-to-enable-real-time-merge-conflict-detection-in-phpstorm-ij1y4htyr source_url: https://agnieszka.hashnode.dev/how-to-enable-real-time-merge-conflict-detection-in-phpstorm type: article source: "Hashnode" published: 2021-10-12T15:57:11.834Z updated: 2021-10-12T15:57:11.835Z tags: ["devtools"] reading_time: 2 upvotes: 29 comments: 0 language: en --- > ## Documentation Index > Fetch the complete documentation index at: https://daily.dev/llms.txt > Use this file to discover all available pages before exploring further. # How To Enable Real-Time Merge Conflict Detection in PhpStorm **[Hashnode](https://daily.dev/sources/hashnode)** · 2 min read · 29 upvotes · 0 comments ## Summary PhpStorm has an early warning system for merge conflicts. If enabled there will be change indicators in the gutter of the editor. These will show you where your teammates have made changes compared to your version of the file and even update in real-time. For simple conflicts this can be a quick way to resolve them. ## Full article daily.dev links to this article rather than hosting it. Read it at the original source: ## Similar posts on daily.dev - [Don’t just attend KubeCon \+ CloudNativeCon, Merge Forward your experience\!](https://daily.dev/posts/don-t-just-attend-kubecon-cloudnativecon-merge-forward-your-experience--l0rpp73x8) · CNCF · 0 upvotes · 0 comments - [Announcing H2 2026 KCDs](https://daily.dev/posts/announcing-h2-2026-kcds-m96goajm1) · CNCF · 1 upvotes · 0 comments - [Two months of Open Community Groups](https://daily.dev/posts/two-months-of-open-community-groups-asf52zhbs) · CNCF · 0 upvotes · 0 comments - [CNCF Unveils Schedule for KubeCon \+ CloudNativeCon Europe 2026](https://daily.dev/posts/cncf-unveils-schedule-for-kubecon-cloudnativecon-europe-2026-ikhcoa5cb) · CNCF · 2 upvotes · 0 comments - [CNCF Debuts KubeCon \+ CloudNativeCon Japan 2026 Schedule](https://daily.dev/posts/cncf-debuts-kubecon-cloudnativecon-japan-2026-schedule-xp5pyudub) · CNCF · 1 upvotes · 0 comments --- Tags: [#devtools](https://daily.dev/tags/devtools) [View this post on daily.dev](https://daily.dev/posts/how-to-enable-real-time-merge-conflict-detection-in-phpstorm-ij1y4htyr)