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 382
    • Issues 382
    • 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
  • #2590
Closed
Open
Issue created Sep 18, 2015 by SilverFox@yyjdelete

When conflict with images, can not reslove with TortoiseGitIDiff by Click select

  1. Double click the conflicted image or right click and click Edit conflicts to open TortoiseGitIDiff
  2. Choose one image and click select
    image
    Expect: Resloved with the selected image
    Actually: TortoiseGitIDiff closed but nothing changed, Only got an temp file like .merge_file_a01172
    (Only right click the file in commit dialog, and click Resolve conflict using '*' works)

TortoiseGit 1.8.15.1 (D:\Tools\TortoiseGit\bin)
git version 2.5.2.windows.2 (20150820-da295330; D:\Tools\Git\bin; D:\Tools\Git\mingw64; D:\Tools\Git\mingw64\etc\gitconfig)

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