Skip to content
GitLab
    • GitLab: the DevOps platform
    • Explore GitLab
    • Install GitLab
    • How GitLab compares
    • Get started
    • GitLab docs
    • GitLab Learn
  • Pricing
  • Talk to an expert
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
    Projects Groups Topics Snippets
  • Register
  • Sign in
  • TortoiseGit TortoiseGit
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
    • Locked files
  • Issues 380
    • Issues 380
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 16
    • Merge requests 16
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test cases
  • Deployments
    • Deployments
    • Releases
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Issue
    • Repository
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • TortoiseGitTortoiseGit
  • TortoiseGitTortoiseGit
  • Issues
  • #3086
Closed
Open
Issue created Oct 05, 2017 by Paolo Nesti Poggi@tribis

merge-doc.js: Merge document in word >=2010 leaves three open windows

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. In Word >= Office 2010 the script leaves several open documents.

What is the expected output? What do you see instead? The script should only leave one window open: The one with the merged and compared documents.

Three windows are left open instead.

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 1.9.5.msysgit.1 (C:\Program Files\Git\bin; C:\Program Files\Git; C:\Program Files\Git\etc\gitconfig; C:\ProgramData\Git\config)

Windows 7, Office 2010

Please provide any additional information below.

I have an updated script that fixes the issue but I can't find a way to submit a merge request (no "new merge request" button available?).

See also issues #3085 (closed) and #3084 (closed)

Edited Oct 16, 2017 by Sven Strickroth
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking