Package com.atlassian.bitbucket.scm.git.command.merge.conflict

Class ImplicitDirectoryRenameGitMergeConflict

java.lang.Object

com.atlassian.bitbucket.scm.git.command.merge.conflict.AbstractGitMergeConflict

com.atlassian.bitbucket.scm.git.command.merge.conflict.AbstractPathGitMergeConflict

com.atlassian.bitbucket.scm.git.command.merge.conflict.ImplicitDirectoryRenameGitMergeConflict

All Implemented Interfaces:

GitMergeConflict

public class ImplicitDirectoryRenameGitMergeConflict
extends AbstractPathGitMergeConflict

Indicates an implicit directory rename failed because an existing directory or file prevented git merge from moving one or more files to the renamed directory.

This is one of two possible triggers for GitMergeConflictType.IMPLICIT_DIRECTORY_RENAME; the other is ConvergentDirectoryRenameGitMergeConflict.

Since:

6.3

See Also:

• ConvergentDirectoryRenameGitMergeConflict
• GitMergeConflictType.IMPLICIT_DIRECTORY_RENAME

Constructor Summary

Constructors

Constructor	Description
ImplicitDirectoryRenameGitMergeConflict(String message, String path, List<String> srcPaths)

Method Summary

Modifier and Type	Method	Description
void	accept(GitMergeConflictVisitor visitor)
List<String>	getSrcPaths()

Methods inherited from class com.atlassian.bitbucket.scm.git.command.merge.conflict.AbstractPathGitMergeConflict

getPath

Methods inherited from class com.atlassian.bitbucket.scm.git.command.merge.conflict.AbstractGitMergeConflict

getMessage, getOurChange, getTheirChange, getType

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Constructor Details

ImplicitDirectoryRenameGitMergeConflict

public ImplicitDirectoryRenameGitMergeConflict(@Nonnull
 String message,
 @Nonnull
 String path,
 @Nonnull
 List<String> srcPaths)

Method Details

accept

public void accept(@Nonnull
 GitMergeConflictVisitor visitor)

getSrcPaths

@Nonnull
public List<String> getSrcPaths()

Returns:

a list containing 1 or more source paths which git merge could not rename due to an existing directory or file