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

Class SubmoduleGitMergeConflict

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

All Implemented Interfaces:

GitMergeConflict

public class SubmoduleGitMergeConflict
extends AbstractPathGitMergeConflict

A merge conflict where the same submodule has been updated to point to different commits.

Constructor Summary

Constructors

Constructor	Description
SubmoduleGitMergeConflict(String message, String path)

Method Summary

Modifier and Type	Method	Description
void	accept(GitMergeConflictVisitor visitor)

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

SubmoduleGitMergeConflict

public SubmoduleGitMergeConflict(@Nonnull
 String message,
 @Nonnull
 String path)

Method Details

accept

public void accept(@Nonnull
 GitMergeConflictVisitor visitor)