Conflict – Notifies a developer of conflicts between his/her work and that of other developers.
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.
Installing Conflict Server
$ gem install conflict
Running Conflict Server
To run the Conflict server with default settings …
$ conflict
To run the Conflict server on TCP/IP port 123 …
$ conflict -port 123
To run the Conflict server with event expiration set to one minute …
$ conflict -ttl 60