idea: make the syncdb file format aware of git merge conflicts

[williamstein]

SMC heavily uses a file format -- e.g., for chat, task lists, etc., -- which is one JSON document per line.

If you have such files (e.g., task lists) checked in to git and do a merge, you'll end up with a file that suddenly doesn't have that format. You can -- of course -- try to do the merge by hand. It would be cool if SMC were aware of this though, so if such a file has git merge marking in it, instead of rendering in the normal way, it provides a 3-way merge UI... or something.

This is just a sort of wishlist item for next year.