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)
- Create a new local Git repository
- Create commit
CommitA
with filetest.txt
whose content isa test
- Create commit
CommitB1
changingtest.txt
's content tob1 test
- Create a new branch at
CommitA
and switch to it - Create commit
CommitB2
changingtest.txt
's content tob2 test
- Try merging branch
main
(ormaster
) into the current branch
ℹ A merge conflict should occur - In the TortoiseGitMerge window resolve the conflict (e.g. by selecting "Use this whole file" on the HEAD pane), then press "Mark as resolved"
- Press F5 / the "Reload" button
ℹ All panes are now blank - Press "Mark as resolved again"
- 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".