locked
3-Way Merge - Office Documents (XML Format) RRS feed

  • Question

  • Hi all,

    I am looking for a way to merge office documents (word, excel, ppt) using a 3-way merge tool, for use with version control systems.

    My scenario is I have a base version (the common ancestor) and "left" and "right" branch versions where there has been divergent changes.

    It seems SharePoint is capable of doing this, as when multiple users are working on a word document simultaneously, and a user saves - if there has been updates since the last time they saved, it can merge and detect conflicts (only achievable by doing a 3-way merge).

    Is there a Microsoft tool that can perform this 3-way merge on the XML based document formats (docx, xlsx, pptx)?

    Thanks,

    Adam

    Wednesday, May 13, 2015 2:36 AM

Answers

All replies