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.