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

Class DirectoryFileGitMergeConflict

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

All Implemented Interfaces:

GitMergeConflict

public class DirectoryFileGitMergeConflict
extends AbstractPathGitMergeConflict

See Also:

• FileDirectoryGitMergeConflict

Constructor Summary

Constructors

Constructor	Description
DirectoryFileGitMergeConflict(String message, String path, String theirTmpFile)

Method Summary

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

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

DirectoryFileGitMergeConflict

public DirectoryFileGitMergeConflict(@Nonnull
 String message,
 @Nonnull
 String path,
 @Nonnull
 String theirTmpFile)

Method Details

accept

public void accept(@Nonnull
 GitMergeConflictVisitor visitor)

getTheirTmpFile

@Nonnull
public String getTheirTmpFile()