Package com.atlassian.bitbucket.scm.git.command.merge.conflict
package com.atlassian.bitbucket.scm.git.command.merge.conflict
-
ClassDescriptionIndicates an implicit directory rename failed because multiple directories which each contained a subset of the same files were renamed to the same target directory.Describes a conflict where two different files are renamed to the same destination.A merge conflict where the same file or directory has been renamed differently on each side of a merge.Indicates an implicit directory rename failed because an existing directory or file prevented
git mergefrom moving one or more files to the renamed directory.Describes a conflict where two different files are renamed to the same destination.A merge conflict where the same submodule has been updated to point to different commits.