[darcs-users] Bounty on the conflict misery bug

[Salvatore Insalaco]

2007/8/17, Alexander Staubo <alex at purefiction.net>:
> We have patiently been waiting for a fix, but there seems to be
> nothing on the horizon.

Actually there is. Jason is working on a Google Summer of Code project
about the conflict-handling in Darcs, and some code is already in
darcs-unstable (albeit not actually working for "real world" usage).

If you like Darcs (as I do), you have just to wait a little more.

Salvatore