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

Class ConvergentDirectoryRenameGitMergeConflict

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.ConvergentDirectoryRenameGitMergeConflict

All Implemented Interfaces:

GitMergeConflict

public class ConvergentDirectoryRenameGitMergeConflict
extends AbstractPathGitMergeConflict

Indicates an implicit directory rename failed because multiple directories which each contained a subset of the same files were renamed to the same target directory.

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

Since:

6.3

See Also:

• GitMergeConflictType.IMPLICIT_DIRECTORY_RENAME
• ImplicitDirectoryRenameGitMergeConflict

Constructor Summary

Constructors

Constructor	Description
ConvergentDirectoryRenameGitMergeConflict(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

ConvergentDirectoryRenameGitMergeConflict

public ConvergentDirectoryRenameGitMergeConflict(@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 attempted to rename to the same target path