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
  • #2157
Closed
Open
Issue created Aug 02, 2015 by Sven Strickroth@mrtuxOwner

TortoiseGitMerge does not delete temporary files on close (marking as "resolved" in TGit necessary)

By angely.... on April 04, 2014 13:32 (imported from Google Code)


What steps will reproduce the problem?

  1. Cause simplest conflicts
  2. Open TortoiseGitMerge (right-click on the file -> Edit conflicts)
  3. Do nothing and close the window

What is the expected output? What do you see instead?
Temporary files REMOTE, LOCAL, BASE should be deleted but they are NOT.

What version of TortoiseGit and msysgit are you using?
TortoiseGit 1.8.8.0
Git-1.9.0-preview20140217

On what operating system?
Windows 7 Professional 64 bits

Please provide any additional information below.
Related to issue #445 (closed)
It is fixed for 32-bit version but not 64-bit. Thanks.

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking