tree 201020923318b4ad1ff72727f1e6ba606e330c13
parent fe4b2a46563ec2006106ee2318dbf27dfcdef3c5
author Marija Savtchouk <mariasavtchouk@google.com> 1611241737 +0000
committer Marija Savtchouk <mariasavtchouk@google.com> 1612884363 +0000

Allow dir/file conflicts in virtual base commit on recursive merge.

If RecursiveMerger finds multiple base commits, it tries to compute
the virtual ancestor to use as a base for the three way merge.
Currently, the content conflicts between ancestors are ignored (file
staged with the conflict markers). If the path is a file in one ancestor
and a dir in the other, it results in NoMergeBaseException
(CONFLICTS_DURING_MERGE_BASE_CALCULATION).

Allow these conflicts by ignoring this unmerged path in the virtual
base. The merger will compute diff in the children instead and it
can be further fixed manually if needed.

Change-Id: Id59648ae1d6bdf300b26fff513c3204317b755ab
Signed-off-by: Marija Savtchouk <mariasavtchouk@google.com>