locked
TFS Merging Issue for Pdf & Xls Files RRS feed

  • Question

  • Hi,

    Need some help on TFS Merging

    This is the tfs merging issue we are looking solution since long time.

    let say there are two branches derived from mail branch, simultaneously two people are working on same file (file type is xls and pdf) in two different branches, after that we want to merge both the branch changes to main line. Tfs is not allowing to merge these pdf file format to the main branch because of it is binary format.

    Can some one help in this regards.

    Thanks & Regards

    Venu

    Thursday, January 31, 2013 12:44 PM

Answers

  • Hi Venu,

    As you said, merging of binary files is not possible. So if on both side of the branch, the files have been changed, the only option you have is to either choose for the source or the target version.

    For Excel there might be a workaround. The new Excel files are actually ZIP files containing XML files. XML is text, so the TFS merge can work with that. There is also a possibility to configure another merge/compare tool:

    Refer to this topic;

    http://social.msdn.microsoft.com/Forums/pl/tfsversioncontrol/thread/d00e31d1-cf40-45df-bfbf-b5a1a8fae3d4 (although an old post referring to TFS 2005)

    Another article with more or less the same answer (although more recent);

    http://stackoverflow.com/questions/5955793/ms-office-file-diff-under-tfs

    For the PDF part I don't know about any solution to that, apart from storing the text contents of the PDF only.

    Kind regards,

    Fokko


    ALM/TFS Consultant, Software Developer C#.NET, SQL Server specialist at Delta-N BV (http://www.delta-n.nl)

    Thursday, January 31, 2013 1:50 PM