Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
TortoiseGit
TortoiseGit
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 302
    • Issues 302
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
    • Iterations
  • Merge requests 9
    • Merge requests 9
  • Requirements
    • Requirements
    • List
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test Cases
  • Analytics
    • Analytics
    • CI/CD
    • Code Review
    • Insights
    • Issue
    • Repository
    • Value Stream
  • Members
    • Members
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • TortoiseGit
  • TortoiseGitTortoiseGit
  • Issues
  • #3084

Closed
Open
Created Oct 05, 2017 by Paolo Nesti Poggi@tribis

Various issues with merge-doc.js script: Alert message pointing to unexisting location

What steps will reproduce the problem?

  1. Create a merge conflict on one .docx file, after clicking the "resolve" button, right click on the link and select "Edit conflicts"
  2. The merged Word document opens and at the end an alert message pops up like below:

alert-before

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
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking