GIT - Way to track file changes in your team and warn about potential conflicts
<p>I am looking for a way/tool to to get notified if someone else on my team is editing the same file as I am. This is in order to prevent conflicts when merging later. It's not about locking the file, but only about turning your attention to it (and then starting a conversation with the other developer if necessary).</p>

<p>And no, I don't think the solution would be better team communication. Regardless of how good your team communication is, there are always cases where you need to make a few changes to various files while working on the "agreed" files. It would not be all that productive if every ten minutes you shout out to everyone "hey, is anyone making changes to that-and-that file?"...</p>

<p>A process/tool like this will improve our productivity by:</p>

<ul>
<li>avoiding unnecessary questions ("anyone changing this file?")</li>
<li>avoiding code conflicts and difficult merges</li>
<li>not wasting time to refactor the same file that someone else is refactoring</li>
</ul>

<p>(I have searched but haven't been able to find an answer. Related question: <a href="https://productivity.stackexchange.com/questions/16721/git-way-to-track-file-changes-in-your-team-and-warn-about-potential-conflicts">https://productivity.stackexchange.com/questions/16721/git-way-to-track-file-changes-in-your-team-and-warn-about-potential-conflicts</a>)</p>