Various issues with merge-doc.js script: Alert message pointing to unexisting location
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 and at the end an alert message pops up like below:
What is the expected output? What do you see instead?
If you click yes, the page where you are sent to is no longer existing.
What version of TortoiseGit and Git are you using? On what operating system?
TortoiseGit 2.5.0.0 (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)
Windows 10
Please provide any additional information below.
I will report more issues regarding this same script. I hope this is the intended way to do it, instead of reporting them all at once.
I have an updated script that fixes the issues but I can't find a way to submit a merge request.
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information