Skip to content

GitLab

  • Menu
Projects Groups Snippets
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • thg thg
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 834
    • Issues 834
    • List
    • Boards
    • Service Desk
    • Milestones
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • mercurial
  • TortoiseHg
  • thgthg
  • Issues
  • #3891

Closed
Open
Created Sep 02, 2014 by Bitbucket Importer@bitbucket_importerOwner

Data loss when using "Tool Resolve" with Beyond Compare 3

Created originally on Bitbucket by Gili

Windows 7, 64-bit TortoiseHg 3.1

  1. Update from the current revision to a future revision that involves merge conflicts to a binary file (e.g. docx file was modified).
  2. When the Resolve Conflicts dialog comes up, hit "Tool Resolve"
  3. In my case, Beyond Compare 3 is the default resolve tool. When I hit "Tool Resolve" the local file is marked as Resolved but no attempt is made to resolve the conflicts. Hence, any changes introduced by the "other" branch are lost.

Expected behavior: if the tool does not know how to resolve conflicts in a file type, the file should not be marked as Resolved. Instead, the user should resolve conflicts by hand or using a different tool.

Edited Sep 26, 2020 by Matt Harbison
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking