Resolve UI (TortoiseGitMerge) doesn't prompt to "Mark as resolved" when all conflicts have been dealt with and the file is saved
What steps will reproduce the problem?
- Use the "Resolve..." feature of TortoiseGit on a conflicted merge and open one conflicted file with it (uses TortoiseGitMerge)
- Resolve all conflicts in the file
- Save the file (I was using CTRL+S)
- Nothing else happens, no prompt to "Mark as resolved"
What is the expected output? What do you see instead?
- Use the "Resolve..." feature of TortoiseGit on a conflicted merge and open one conflicted file with it (uses TortoiseGitMerge)
- Resolve all conflicts in the file
- Save the file (I was using CTRL+S)
- The UI prompts to "Mark as resolved" with a dialog in the center of the screen as soon as the file is saved.
What version of TortoiseGit and Git are you using? On what operating system?
Version 2.14.0.0 on Windows 11 Pro 22H2 (22621.1105)
Please provide any additional information below.
Before updating, it always prompted to "Mark as resolved" as soon as you saved the file with all conflicts resolved, it's a very useful feature to prevent the person merging from closing the interface without actually marking as solved.
Edited by Marc Espiard