ResolveDlg: Merge conflict file gets changed after fixing merge and pressing Resolve
What steps will reproduce the problem?
- Have a conflict after merging a branch in (my file was .gitignore)
- Correct the conflict taking all content from the merged in branch (personally was using BeyondCompare)
- Press Resolve to acknowledge fixing the conflict
- See that the changes you just made have been removed leaving what was on the Base once more.
- (optional) commit incorrect code
What is the expected output? What do you see instead? With 2.10.0 any changes I'd made when correcting the conflict were preserved after pressing Resolve. I made changes. I want to keep those changes. This is what I consider correct. After After using 2.15.0, a conflict being Resolved causes a change in the merged file back to the pre-merge content (so it seems).
What version of TortoiseGit and Git are you using? On what operating system? 2.15.0 Windows 10 64bit
git version 2.31.1.windows.1
Please provide any additional information below.