Repository branch in regards to UCC

[Wolfe]

I'm hacking around with some things involving combat mechanics, and I'd like to avoid having conflicts with the Unified Combat Control that's being worked... Can anyone recommend which branch I should work with? Would be a non-issue, but there's the primary branch and a ucc_merged that, as far as I can tell from the logs, are both being worked on.

[galehar]

the ucc branch is being worked on by cryptic, and I think ucc_merged is a partial merge done by kilobyte. I suggest you ask one of them on ##crawl-dev, but I don't think they are around these days. You can also try asking on crawl-ref-discuss.