Marija Savtchouk 1b9911d9ae 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>		2021-02-09 15:26:03 +00:00
..
.settings	Move reachability checker generation into the ObjectReader object	2021-01-28 22:17:26 -08:00
META-INF	Move reachability checker generation into the ObjectReader object	2021-01-28 22:17:26 -08:00
findBugs	[spotbugs] Silence NP_BOOLEAN_RETURN_NULL in IgnoreNode#checkIgnored	2020-12-22 10:52:59 +01:00
resources/org/eclipse/jgit	TransportHttp: support preemptive Basic authentication	2021-01-14 16:23:45 +01:00
src/org/eclipse/jgit	Allow dir/file conflicts in virtual base commit on recursive merge.	2021-02-09 15:26:03 +00:00
.classpath	Change JGit minimum execution environment to JavaSE-1.8	2016-09-20 11:32:36 +02:00
.fbprefs	…
.gitignore	…
.project	…
BUILD	Fix stamping to produce stable file timestamps	2020-12-14 15:45:29 +01:00
about.html	SHA-1: collision detection support	2017-02-28 16:38:43 -08:00
build.properties	…
plugin.properties	Fix bundle localization of Apache SSH bundle	2019-06-21 17:54:06 +02:00
pom.xml	Prepare 5.11.0-SNAPSHOT builds	2020-12-02 15:57:16 +01:00