create a merge commit [...] _file_conflict_strategy” is set to “GitResolveFileConflictStrategy.Normal”.
: Number of items
witch is the current [...] if there is no
