Conflict
Mailing List
Source
Issues
Windows Download
Eclipse Download
Server Download
Author
What is Conflict?
Conflict notifies a software developer of potential conflicts between his/her work and that of other developers, before the commit.
Conflict is an open source project composed of two parts: Conflict clients and a Conflict server. A Conflict client is a transparent process running on the workstation of each developer. It stays in the background, reporting local file system changes to the Conflict server. When the Conflict server detects a conflict between two or more developers, each developer is notified. The Conflict project improves feedback and communication while encouraging developers to check in code frequently.
|
To the right, a developer is being notified of a potential problem via a Windows tray icon. Below, a developer has begun working on the source code file. At the bottom of the IDE, a notification message tells developer that someone else is working with the same file. |
 |
