Package com.atlassian.bitbucket.scm.git.command.merge
package com.atlassian.bitbucket.scm.git.command.merge
-
ClassDescriptionAn exception that is thrown when the merge could not be completed because the target branch includes identical changes and the rebase discarded all the incoming commits.An exception that is thrown when the merge could not be completed because the target branch includes identical changes and the squashed commit would be empty.GitMergeBaseBuilderSupport<B extends GitMergeBaseBuilderSupport<B>>A builder which can be used to construct a
commandfor runninggit merge.GitMergeBuilderSupport<B extends GitMergeBuilderSupport<B>>A base class for constructing builders aroundgit merge, supplying properties which are common to all usages of the command.Describes the possible fast-forward settings forgit merge.An exception that is thrown when the merge fails due to some error related to chosen merge strategy.Error thrown when two or more refs have no common ancestor.An exception that is thrown while rebasing the source branch onto target branch before merging.A builder which can be used to construct acommandfor runninggit merge --squash.An exception that is thrown when merge is attempted with unsupported merge strategy.