On Aug 5, 2014 11:25 PM, "Nkansah Rexford" <nkansahrexford(a)gmail.com>
wrote:
Thanks for the update Quim. I hope it gets done as
soon as possible, as
it'll go a long way to help multiple concurrent edits.
I think it's been lacking for a long time now, and can't wait to see it in
action.
I think some test cases are in order.
The UI isn't perfect (you could even say confusing if you're not familiar
with it) but IME (in my experience) edits are not lost. The conflict is
either resolved automatically (so both are saved, not one clobbers the
other *OR* it can't be resolved automatically and the 2 versions (current
revision and what you just saved) are both sent back to the user for manual
intervention. You can then diff ("show changes"), etc.
-Jeremy