Detect merge conflicts in realtime

You'll be notified in realtime where the conflicts are and with whom.

Simply get rid of merge hells.

Realtime change detection !

The lightweight baboon client detects in realtime any file changes on your projects.

Sync & Merge !

The changes are synced through a fast and secure channel to Baboon server. The server will then try to detect any conflicts between you and project contributors.

Notification !

Finally, all the team is notified if a merge conflict has occured. The sooner the conflict is detected, the easier it is solved. You'll know where the conflict is and with whom.

Simply get rid of merge hells!

Quickstart

New baboon project !

$ git clone <git-url> <path>
$ baboon register <nick>
$ baboon create <project> <path>
$ baboon start

Existing baboon project !

$ git clone <git-url> <path>
$ baboon register <nick>
$ baboon join <project> <path>
$ baboon init <project> <git-url>
$ baboon start

Need an example ?

$ git clone git://github.com/SeyZ/crazy-baboon ~/
$ baboon register seyz
$ baboon join crazy-baboon ~/crazy-baboon
$ baboon init crazy-baboon git://github.com/SeyZ/crazy-baboon
$ baboon start

Download

PyPI !

pip install baboon

or

easy_install baboon

Archlinux !

yaourt -S baboon-git

Please, vote for the package to be on the [community] repository. Thus, you'll can use the official pacman tool.

Git !

git clone git://github.com/SeyZ/baboon
cd baboon
python setup.py install