Xonotic Conflict Watch (XonCW)

I set up a service to monitor git branhces and whether they currently conflict with master or not at:

http://nl.git.xonotic.org/xoncw/

It is updated every 3 hours, and you can use a RSS reader to get informed when one of your branches causes conflicts.

This is how it looks with Slick RSS in Chromium:



This is how it looks with Feed Sidebar in Firefox:



Have fun!

Nice stuff, thanks.
I just discovered merge conflicts in my itemstime branch without checking it out manually

can they monitor spelling mistakes?

* chooksta is off to get a big bowl of branhces , mmmm

:p

seriously though , cool feature mate


t


:^

Wow, that's awesome. That's going to be super convenient.

Also, what WM is that?

Openbox.

Another excellent addition to Xonotic, thanks

Also, what WM is that?

It might be easier to declare the WM it is not?

Is Unity a WM?

MOST AWESOME!