A better conflict resolution process is badly needed. 

Smart GIT's conflict reoslution was/is a good standard to look at. 

Editing conflicts and lost changes (due to overwrites and people not even noticing) is the one biggest usability problem for us in Confluence. Please revisit this issue.

We are using Confluence and often suffering from editing conflicts.
3-way merge like MediaWiki is absolutely necessary.

Do you have a roadmap to implement this feature?

I'm also interested in seeing this as a feature.

Why not license the solution from a company that implemented (and did so well enough) - like P4?
I'm sure you can devise some partnership with them to acquite an excellent merging ability and then integrate it into your product.

Dan

I would also be very interested to see this feature implemented. It doesn't seem to matter how many times I ask people to not edit whilst someone else is in the page - they still do it!

I would also love to see this feature. As an illustrative example, take a look at how perforce's programmers solved this issue ... very transparent and nice to look at!

Thanks so much for adding this. On several occasions I've had to decide whether to cancel my changes or trash someone else's. Having the option to merge them would be a great alternative!