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

Class FileDirectoryGitMergeConflict

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

All Implemented Interfaces:

GitMergeConflict

public class FileDirectoryGitMergeConflict
extends AbstractPathGitMergeConflict

See Also:

• DirectoryFileGitMergeConflict

Constructor Summary

Constructors

Constructor	Description
FileDirectoryGitMergeConflict(String message, String path, String ourTmpFile)

Method Summary

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

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

FileDirectoryGitMergeConflict

public FileDirectoryGitMergeConflict(@Nonnull
 String message,
 @Nonnull
 String path,
 @Nonnull
 String ourTmpFile)

Method Details

accept

public void accept(@Nonnull
 GitMergeConflictVisitor visitor)

getOurTmpFile

@Nonnull
public String getOurTmpFile()