Optional_linksOptionalconflictOptionalconflictOptionalconflictOptionalmergeOptionalmergeOptionalmergeOptionalmergeOptionalresolutionOptionalresolutionOptionalresolutionOptionalresolvedOptionalresolvedOptionalsourceOptionaltargetOptionalurl
Data object for FileDirectory conflict