Prevent overwrite when more than one user are editing the same page at the same time.
Offer merge / diff view?
Now available in 2.2
@Nicolas Giard: Are there any plans to add a "Merge" conflicts feature? When a conflict is found, it appears to just ask which change you want to overwrite.
@David Rudich: That's what merge is... You get a diff view and choose how to merge it by selecting some of your changes or some of the changes made by the other user. What are you looking for exactly?
@Nicolas Giard: A merge is being able to "merge" (or combine) changes together. So if User A and User B open a page at the same time, neither of their changes will be overwritten. In my testing, it appears that if User A makes a change, clicks Save, then User B is presented with a "Conflict" screen when they hit Save. Then User B has to decide if his/her changes will remain or if User A's changes will overwrite User B's changes. Ideally, when User B goes to save their changes, they should be able to keep both their changes and User A's changes - it doesn't appear that this is an option, unless I'm missing something?
@David Rudich: You can edit directly the diff view and pick changes you want, then save that version.
@Nicolas Giard: Thank you. I see that, but it would nice if there was a third option/button to combine the changes for the user versus User B then being responsible for trying to add all of User A's changes to the left side of the diff view before saving.
A simple locking feature would be sufficient.
The need for real-time editing will save a lot of time in the company.
Would it be possible to have a real time updated text editor similar to google docs?
This would be a killer feature for multiple people working on the same document at the same time because they could collaborate more easily.
This is currently a real blocker for us. A simple locking mechanism would be sufficient from our point of view for the time being. As this feature was once planned for v2.1: Is there already a new version for which this will be implemented?
With respect to the previous posts, Nicolas was not describing real-time collaboration.
In MediaWiki, when you edit a page and try to save changes, MediaWiki checks if the state of the active page matches the state of the page when you opened the page for editing.
If the current state is different, MediaWiki prompts you for confirmation if you would like to overwrite the current page with your changes. The raw text of both versions are displayed with the differences highlighted. This could be fairly trivial to implement.
A more sophisticated solution would be to provide a merge/diff UI so that users can pick and choose which changes to keep, but I think this might add some unnecessary complexity that might be confusing for nontechnical users.
This stuff is hard: https://en.wikipedia.org/wiki/Operational_transformation
Maybe use https://github.com/josephg/ShareJS
@Bart: ShareJS is now ShareDB
One can have a look at https://growi.org how this might look like.
real-time collaboration (like Google Docs) will be wonderful best feature!
All other wikis don't have it.
In our organization, live editing is used all the time we have brainstorming / writing meeting minutes ...