rebasing a removed file with merge conflict does not resolve correctly
Closed this issue · 1 comments
mithom commented
steps to duplicate:
- create a branch
- remove a file
- go back to original branch
- adjust the removed file
- rebase branch onto original branch
- try selecting the option that would result in the file delete
- get the error
alternatively
- when selecting the option with the changed file, it also does not show up in the staged files
expected behavior:
being able to select either one of the options with the expected result of deleting the file, or keeping it with the expected changes
love-linger commented
Done. You can download the latest CI build from Github Action.