VersionControl.ResolveMethod.UseMerged
Description