Come together with the global Drupal community in Rotterdam, 28 Sept – 1 Oct 2026. Sessions, contribution, connection, and Early Bird savings until 8 June.Problem/Motivation
The automerge feature is working quite well. For the content editor I could imagine that the feature is almost working too smooth, because it's a silent process. The reason is, that there is currently no notification, that a automerge was successfully processed. Actually if the content editor B does not know about the activity of editor A, he could be really surprised, that the content ends up different, like how he was submitting it. In my opinion there is a real need to make the editors aware of "the others".
Proposed resolution
1) One naive solution would be to simply show a message, that a auto merge process was applied. That would solve at least the "surprise moment", that the content is appearing differently after saving.
2) There is also a more advanced notification imaginable. The user would not only be informed that there was a auto merge happening, but also who was working concurrently on the same content.
Comments
Comment #2
hchonov@szeidler, this is a good idea. Do we want to notify the user which fields have been auto merged? Do we want to show this message even after a manual conflict resolution has been applied, but some of the fields have been auto merged?
Comment #3
szeidler commentedComment #4
szeidler commentedYes, it's really valuable to inform the user about which fields have been changed.
I think yes.
It's quite a challenge to create a (for client understandable) message. A suggestion would be:
This content have been changed by another user. The following fields have been successfully merged: "Title", "Body".A few objections from my side.
This contentconflict module supports more than content, right?by another userit could have been even more than one userssuccessfully mergedis "merge" a techy term?Comment #6
hchonovAll kind of content entities are supported. "This content" just references the current page and this is how it is being used in the Drupal context. As an example the message being shown without the conflict module is :
The content has either been modified by another user, or you have already submitted modifications. As a result, your changes cannot be saved.I guess we could avoid mentioning "user" at all.
Probably we should then use the word "applied"?
Thinking about this, I guess it might be good to use a message similar to the Drupal core one, when there are changes. I've just committed the feature with the following message:
The content has been modified meanwhile. Changes for the following fields have been successfully applied: "%fieldsIf you don't like it we still can change it. Could you please try the new feature and give me a feedback on it?
Comment #7
szeidler commentedI tested the version and it seems to work perfectly. Thanks!
I was testing it with two users, but also 3 users to see, that the affected field list is also accurate for the user, who saves latest.
The message actually sounds really good. I think we can either leave out the quotation marks at all or wrap every single field label with them. Currently they are wrapping the whole field list.
Comment #9
hchonovI've removed the quotation marks and I think the issue is resolved now.
If you think that it might still be useful to show the name of the author(s) of the applied changes, then would you please open a new issue for that? Unfortunately I think for such a feature there are more things to consider - i.e. is a user allowed to see the author or revision user of an entity. Therefore I think a dedicated issue would be better.