Fine-grained version control can solve that problem. Unfortunately there isn't much support for it at the moment. So it's all a solved problem but no one uses i

Fine-grained version control can solve that problem. Unfortunately there isn't much support for it at the moment. So it's all a solved problem but no one uses it. I was doing some research for a paper on fine-grained version control to be able to deal with web content, recipes, songs, and other types of "documents" which rely on things other than paragraphs and lines. There has been a LOT of research done on the subject and I found some papers that deal with version control for Web content and some for dealing with XML content.