dimagi/Vellum — pull request #289 by emord (2014-12-16 02:09:06+00:00)
Title: Warn before overwriting work

So I attempted to do this as a PID on a flight. @orangejenny brought this up in her field report. No HQ changes necessary.

I also attempted to do some work on automatically merging conflicts: https://github.com/dimagi/Vellum/compare/concurrent-editors

While that works suprisingly ok for non conflicting changes, I had to fix enough malformed XML to not recommend merging that, but it may give a starting point.