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

Class DivergentDirectoryRenameGitMergeConflict

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

All Implemented Interfaces:

GitMergeConflict

public class DivergentDirectoryRenameGitMergeConflict
extends AbstractPathGitMergeConflict

Indicates a directory rename failed because a single directory was renamed to multiple target directories and git merge could not decide where to move a file.

Since:

6.3

See Also:

GitMergeConflictType.SPLIT_DIRECTORY_RENAME

Constructor Summary

Constructors

Constructor and Description
DivergentDirectoryRenameGitMergeConflict(String message, String path, String srcPath)

Method Summary

Modifier and Type	Method and Description
void	accept(GitMergeConflictVisitor visitor)
String	getSrcPath()

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 Detail

DivergentDirectoryRenameGitMergeConflict

public DivergentDirectoryRenameGitMergeConflict(@Nonnull
                                                String message,
                                                @Nonnull
                                                String path,
                                                @Nonnull
                                                String srcPath)

Method Detail

accept

public void accept(@Nonnull
                   GitMergeConflictVisitor visitor)

getSrcPath

@Nonnull
public String getSrcPath()

Returns:

a file which could not be moved because the containing directory was renamed to multiple directories, so git merge could not choose a destination