package

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

Interfaces

GitMerge An interim builder to allow callers to choose between a normal git merge and a squashing merge. 
GitMergeBase  
GitMergeBaseBuilder  
GitMergeBaseBuilderSupport<B extends GitMergeBaseBuilderSupport<B>>  
GitMergeBaseIndependentBuilder  
GitMergeBuilder A builder which can be used to construct a command for running git merge
GitMergeBuilderSupport<B extends GitMergeBuilderSupport<B>> A base class for constructing builders around git merge, supplying properties which are common to all usages of the command. 
GitSquashMergeBuilder A builder which can be used to construct a command for running git merge --squash

Enums

GitMergeFastForward Describes the possible fast-forward settings for git merge

Exceptions

GitMergeException  
GitNoCommonAncestorException Error thrown when two or more refs have no common ancestor. 
GitNonFastForwardMergeRejectedException