CoDiff

CoDiff has live access to all your teammates local changes, greatly improving communication: it notifies you of conflicts with teammates as they occur. Even as an individual, it can still notify you as soon as your changes conflict with upstream commits.