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

Class RenameAddGitMergeConflict

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

All Implemented Interfaces:

GitMergeConflict

public class RenameAddGitMergeConflict
extends AbstractPathGitMergeConflict

See Also:

• AddRenameGitMergeConflict

Constructor Summary

Constructors

Constructor	Description
RenameAddGitMergeConflict(String message, String path, String ourSrcPath, String theirTmpPath)

Method Summary

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

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

RenameAddGitMergeConflict

public RenameAddGitMergeConflict(@Nonnull
 String message,
 @Nonnull
 String path,
 @Nonnull
 String ourSrcPath,
 @Nullable
 String theirTmpPath)

Method Details

accept

public void accept(@Nonnull
 GitMergeConflictVisitor visitor)

getOurSrcPath

@Nonnull
public String getOurSrcPath()

getTheirTmpPath

@Nullable
public String getTheirTmpPath()