Keep changes from 2 versions

Question

Hi All, I've faced quite a challenging problem with merging content between Confluence instances.

Our company exchanges documents with the customer by Confluence. They export their Confluence branch, we clean it up and import it to our server to revise it. When we import their data we simply overwrite the branch, so we have no issues. During revision we apply changes to the content and export it back to the customer, and here comes the above said issue with content merging.

By the moment we export the revised content, the users on the customer's side may have already made some changes to the content too, and somehow we need to add both our changes and preserve theirs.

Is it possible somehow?

Bill Bailey · Accepted Answer

Welcome Dmitri. That is a super tough problem to solve. And I am not aware of any solution that can resolve the deltas between the two. You would have to move to more of a checkout flow, where one page is locked while the sibling page is being edited in the other instance. And again, I know of no commercial solution to do that for you.

Really your best solution is to either work on yours or the customer's instance, or set up a third instance that is solely for collaboration.