Is your feature request related to a problem? Please describe.
I had accidentally added an empty file in a commit (A). In parallel I had another commit (B) where I had added the same file with some content. So a graph like:
I now try to rebase B onto A. This leads me to a conflict, because both A and B are adding the same file. Using the built in resolver is slightly confusing though as it doesn't allow you to do anything.
Describe the solution you'd like
It would be nice if the resolve tool would somehow indicate that the conflict relates to an empty file and make it possible to resolve it by ignoring the empty file for instance.
Is your feature request related to a problem? Please describe.
I had accidentally added an empty file in a commit (A). In parallel I had another commit (B) where I had added the same file with some content. So a graph like:
I now try to rebase B onto A. This leads me to a conflict, because both A and B are adding the same file. Using the built in resolver is slightly confusing though as it doesn't allow you to do anything.
Describe the solution you'd like
It would be nice if the resolve tool would somehow indicate that the conflict relates to an empty file and make it possible to resolve it by ignoring the empty file for instance.