solving conflicts outside the rebase window doesn't work
What steps will reproduce the problem?
With this repository perform the following operations:
- Start rebase with branch = b2, upstream = master
- Skip commit "5a7.." (last one)
- Pick either Pick All or Squash All
- Start Rebase
- Observe conflict on a.txt
- In the file explorer use the contextual menu on a.txt and choose option Resolve
- Go back to Rebase window and press f5
- Notice how a.txt disappears
What is the expected output? What do you see instead? Expected: a.txt remains in the Rebase window and is marked as resolved Actual: a.txt disappears from the Rebase Window
What version of TortoiseGit and Git are you using? On what operating system?
Windows 10 22H2, Tortoise Git 2.15
Please provide any additional information below.