search

SeyZ / baboon

Detect source code merge conflicts in realtime. Simply get rid of merge hells.
http://baboon-project.org
120 stars 9 forks source link

Avoid direct message to warn there's a conflict or not #28

Closed SeyZ closed 12 years ago

SeyZ commented 12 years ago

Use a pubsub message to warn if there's a conflict or not. The stanza will be something like that :

<type>conflict</type>
<from>johndoe@baboon-project.org</from>
<to>madonna@baboon-project.org</to>
<diff>..................</diff>

The diff can be useful later. The type can be useful to detect if it's a regular diff message (type diff ?) or a conflict message.

SeyZ commented 12 years ago

Fixed with the new baboon architecture. There's no need to a specific stanza message.