merge-doc.js: Word 2007 does not make a three-way comparison and the documents are shown in wrong order
What steps will reproduce the problem?
- Create a merge conflict on one .docx file, after clicking the "resolve" button, right click on the link and select "Edit conflicts"
- The merged Word document opens. In Word 2007 the script does not provide a three-way comparison like for Word >= Office 2010. Furthermore the order of the shown documents is wrong
What is the expected output? What do you see instead? I expect to see the "original document" to be the one in the commit that has been merged-in first and the updated document the one that I'm going to merge now. The opposite happens.
In the picture below you see the .REMOTE.docx file ( the one to be merge in now) is given as the original document, while the one that has already been merged-in is given as the updated document. But I expect the new document to be shown as an update of the existing one.
What version of TortoiseGit and Git are you using? On what operating system?
TortoiseGit 188.8.131.52 (C:\Program Files\TortoiseGit\bin) git version 2.14.1.windows.1 (C:\Program Files\Git\bin; C:\Program Files\Git\mingw64; C:\Program Files\Git\mingw64\etc\gitconfig; C:\ProgramData\Git\config)
Please provide any additional information below.
I have an updated script that fixes the issues but I can't find a way to submit a merge request.
My script will provide a three-way comparison like as for Office 2010 and above, that works for 2007 and shows the document in the correct order.
The script does not need to differentiate between 2007 and 2010, with a minor fix it works for both versions. Further, in connection to issue: #3084 (closed) I would put the alert before the script starts opening the merged document, thus giving the user the time to reflect on what is going to happen, and instead of redirecting to a non existing file I would add the explanation:
" After you click 'OK' we'll create a merge document. Please wait.
Then reject or accept changes and save the document renaming it to the original conflicting filename. "