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

Class DivergentRenameGitMergeConflict

java.lang.Object

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

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

All Implemented Interfaces:

GitMergeConflict

public class DivergentRenameGitMergeConflict
extends AbstractGitMergeConflict

A merge conflict where the same file or directory has been renamed differently on each side of a merge.

See Also:

• ConvergentRenameGitMergeConflict

Constructor Summary

Constructors

Constructor	Description
DivergentRenameGitMergeConflict(String message, String srcPath, String ourPath, String theirPath)

Method Summary

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

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

DivergentRenameGitMergeConflict

public DivergentRenameGitMergeConflict(@Nonnull
 String message,
 @Nonnull
 String srcPath,
 @Nonnull
 String ourPath,
 @Nonnull
 String theirPath)

Method Details

accept

public void accept(@Nonnull
 GitMergeConflictVisitor visitor)

getOurPath

@Nonnull
public String getOurPath()

getSrcPath

@Nonnull
public String getSrcPath()

getTheirPath

@Nonnull
public String getTheirPath()