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
  • #3790
Closed
Open
Issue created Aug 29, 2021 by Marcono1234@Marcono1234

Reloading changes in TortoiseGitMerge window after resolving conflict can lead to accidental deletion of file content

What steps will reproduce the problem?

(Steps 2 - 5 are only for provoking a content merge conflict)

  1. Create a new local Git repository
  2. Create commit CommitA with file test.txt whose content is
    a
    
    test
  3. Create commit CommitB1 changing test.txt's content to
    b1
    
    test
  4. Create a new branch at CommitA and switch to it
  5. Create commit CommitB2 changing test.txt's content to
    b2
    
    test
  6. Try merging branch main (or master) into the current branch
    ℹ A merge conflict should occur
  7. In the TortoiseGitMerge window resolve the conflict (e.g. by selecting "Use this whole file" on the HEAD pane), then press "Mark as resolved"
  8. Press F5 / the "Reload" button
    ℹ All panes are now blank
  9. Press "Mark as resolved again"
  10. Inspect the file content
    ❌ In step 8 and 9 you accidentally deleted the complete file content

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

Expected: ToirtoiseGit should prevent you from accidentially deleting the file content. Probably after "Reload" the content of the "Merged" (middle lower) pane should not be empty, but contain the current content of the file.

Actual: After "Reload" the middle lower pane is empty and you might by accident delete the file content and all the work you have put into resolving the conflicts of the file.

What version of TortoiseGit and Git are you using? On what operating system?

TortoiseGit 2.12.0.0
git version 2.33.0.windows.2

Windows 10

Please provide any additional information below.

This might only happen for CONFLICT (content); for CONFLICT (add/add) the TortoiseGitMerge windows shows an error when you try to "Reload".

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