[Ditz-talk] Merging issues additions?

[Yurii Rashkovskii]

Hello,

First if all, I would like to thank you for this great tool! In  
StrokeDB project (http://strokedb.com) we've just started using it and  
it looks great!

Though there seems to be few issues. One of them is addressed in this  
merge request: http://gitorious.org/projects/ditz/repos/mainline/merge_requests/39

Another problem is a little bit more painful. When I add an issue and  
another person adds an issue and then I pull his changes in, bugs.yaml  
can't be merged automatically — it messes last addition (it becomes a  
conflict).

I've tried to find some kind of solution for that, but still have no  
idea. Any thoughts?

Yurii.