3 ms·
It seems that conflicts are handled by "last person" wins. I created a site and cloned it. I opened a page in the HTML editor. I edited that page in my git clo
by js2 15y ago
It seems that conflicts are handled by "last person" wins.
I created a site and cloned it. I opened a page in the HTML editor. I edited that page in my git clone and pushed. Finally I edited the open page in the HTML editor and saved.
Both edits are in the repo history, but the edit I pushed via git was clobbered with the content saved via the HTML editor.
I assume this is intentional, but it would seem to me that the HTML editor should note the revision which is being edited, and then upon save if a new revision has been pushed behind its back at least inform the user that the page has been changed in the meantime. (Even nicer would be for the HTML editor to notice updates that happen while the page is being edited and pop-up some sort of notice maybe?)
I'm guessing the same thing would occur if two users edited the same page via the HTML editor?
Edit: On second thought, maybe spintoapp handles multiple users correctly and I only observed this behavior because I used the same account for both edits.
Edit 2: There's a broken link on http://www.spintoapp.com/documentation/controlling_editable_content http://www.spintoapp.com/documentation/controlling_editable_... - "You can learn more about fetching changes with Git." links to www.spintoapp.dev.
- mixonic 15y agoRight, if you open a page then push a change then save the page, the pushed change will get overwritten. I think the best option to lock during editing might be to just reject the push while the editor is open. Thanks for your thoughts. And I'll clean up that link!