I have encountered a scenario in which a merge is not possible, or at least I could not find a way to perform it.
It originated from a mistake where we forgot to add a specific folder into the repo and we had to add it in parallel on several branches.
Is there a way to overcome such incidents?
Here is the scenario:
In CS13, folder D1 and file f1 was added.
In CS21, folder D1 and file f1 was added.
In CS22, file f1 was changed.
D1 and f1 on both branches are the same, they have been added at a later stage in parallel because of various reasons.
After changing f1 (in CS22) a cherry pick merge is attempted from CS22 to CS14 (creating CS15).
However this attempt fails and gives a "directory conflict" with a "change/delete conflict" with a resolution method that does not fit.It just asks me to choose which folder is to be left, but does not try to compare the two.
Is there any way out of this?