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 384
    • Issues 384
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 14
    • Merge requests 14
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Artifacts
    • Schedules
    • Test cases
  • Deployments
    • Deployments
    • Releases
  • Packages and registries
    • Packages and registries
    • Model experiments
  • 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
  • #2147
Closed
Open
Issue created Aug 02, 2015 by Sven Strickroth@mrtuxOwner

Resolve not dealing correctly with (modify/delete) conflicts

By quas... on March 27, 2014 13:05 (imported from Google Code)


What steps will reproduce the problem?

  1. Create a file "test.txt", track it ("git add test.txt") and commit to branch A.
  2. delete "test.txt" and commit to branch B.
  3. switch back to A, modify "test.txt" and commit again.
  4. Still on branch A, try to merge B.
  5. Try to resolve the conflict "using theirs" (from B, the deleted file)

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

The file should be deleted from the working tree.
Instead, the modified version from branch A remains.

What version of TortoiseGit and msysgit are you using? On
what operating system?
git: 1.9.0.msysgit.0
TortoiseGit: 1.8.7.0
OS: Windows 7 professional SP1 64bit

Please provide any additional information below.

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