Resolve does not work on multiple selection during deleted-modifed conflict resolution
What steps will reproduce the problem?
- Do a merge or rebase that causes conflict in multiple files (make sure there are deleted-modifed conflicts)
- Choose files that cause conflict and select one of resolve options (Resolve, Resolve using "their")
- Only one file will have conflict resolved
What is the expected output? What do you see instead?
On step 3 all files should have conflict resolved
What version of TortoiseGit and Git are you using? On what operating system?
TortoiseGit 1.8.15.0 git version 2.6.2.windows
Please provide any additional information below.
To upload designs, you'll need to enable LFS and have admin enable hashed storage. More information