Skip to content
GitLab
  • Menu
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
  • TortoiseGit TortoiseGit
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 367
    • Issues 367
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 14
    • Merge requests 14
  • 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
  • #446
Closed
Open
Issue created Aug 02, 2015 by Sven Strickroth@mrtuxOwner

TortoiseMerge crash when "Edit Conflicts"

By yixia.... on May 27, 2010 08:08 (imported from Google Code)


What steps will reproduce the problem?
1.create repo on an existing folder, commit as 'master' branch
2."Git Sync..." - pull from a remote repo
3."Edit Conflicts" - crash, the error message is "can't open
.../BASE.src/..." but the folder created is REMOTE.src and LOCAL.src no
BASE.src

What is the expected output? What do you see instead?

What version of the product are you using? On what operating system?
1.4.4.0

Please provide any additional information below.
I am using windows7
BTW, do I need to add "/REMOTE.src" etc to .gitignore?


error.JPG

dir.JPG

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