•        0

Conflict allows developers to quot;fail fastquot; by detecting merge conflicts in real time.



comments powered by Disqus

Related Projects


Subversion is an open source version control system. Founded in 2000 by CollabNet, Inc., the Subversion project and software have seen incredible success over the past decade. The open source community has used Subversion widely: for example in projects such as Apache Software Foundation, Free Pascal, FreeBSD, GCC, Django, Ruby, Mono, SourceForge, ExtJS,, PHP and MediaWiki. Google Code also provides Subversion hosting for their open source projects.


IPwatchD is a simple daemon that analyses all incoming ARP packets in order to detect IP conflicts.

Snakebasket - Recursive Python Package Installer

snakebasket is a recursive Python package installer that makes multi-package Python development a little easier. It's a layer on top of pip that can resolve and install an entire dependency graph with a single command: sb install. It recursively reads requirements from simple requirements.txt or old-school files when sb install is run and decides between conflicting versions and installs the latest one.

University Timetabling

UniTime is a comprehensive educational scheduling system that supports developing course and exam timetables, managing changes to these timetables, sharing rooms with other events, and scheduling students to individual classes. It is a distributed system that allows multiple university and departmental schedule managers to coordinate efforts to build and modify a schedule that meets their diverse organizational needs while allowing for minimization of student course conflicts. It can be us


A library for binding to keys and key combos without the pain of key codes and key combo conflicts.


A JavaScript library for binding keyboard combos without the pain of key codes and key combo conflicts.


ceno is a set of eclipse plugins aimed to support collaborative work. The purpose of this toolkit is to avoid merging-conflicts while contributing artifacts to a central repository. It followes the ideas of pessimistic locking

CVS Conflict Editor

CVS Conflict Editor is the must have companion to CVS and WinCVS. No more scrolling down chasing for conflict markers in your files, CVS Conflict Editor does it for you. You can edit your file to solve the conflicts in place, or use the conflict solving

Unison - File synchronization tool for Unix and Windows

Unison is a file-synchronization tool for Unix and Windows. It allows two replicas of a collection of files and directories to be stored on different hosts (or different disks on the same host), modified separately, and then brought up to date by propagating the changes in each replica to the other. Unlike simple mirroring or backup utilities, Unison can deal with updates to both replicas of a distributed directory structure. Updates that do not conflict are propagated automatically.

csync2 - cluster synchronization tool

Csync2 is a cluster synchronization tool. It can be used to keep files on multiple hosts in a cluster in sync. Csync2 can handle complex setups with much more than just 2 hosts, handle file deletions and can detect conflicts. It is expedient for HA-clusters, HPC-clusters, COWs and server farms.

Open source products are scattered around the web. Please provide information about the open source projects you own / you use. Add Projects.

Tag Cloud >>