Uses of Class
com.atlassian.bamboo.plan.branch.MergeResult
-
Uses of MergeResult in com.atlassian.bamboo.plan.branch
Modifier and TypeMethodDescription@NotNull MergeResult
BranchIntegrationHelperImpl.merge
(@NotNull BuildContext buildContext, @NotNull VcsRepositoryData defaultRepositoryDefinition, @NotNull VcsRepositoryModuleDescriptor moduleDescriptor, @NotNull VcsBranch integrationBranch, @NotNull File mergeDir, @Nullable BuildLogger logger) @NotNull MergeResult
VcsBranchIntegrationHelper.merge
(@NotNull BuildContext buildContext, @NotNull VcsRepositoryData repositoryData, @NotNull VcsRepositoryModuleDescriptor moduleDescriptor, @NotNull VcsBranch integrationBranch, @NotNull File mergeDir, @Nullable BuildLogger logger) Modifier and TypeMethodDescriptionvoid
BranchIntegrationHelperImpl.mergeAndUpdateResult
(@NotNull BuildContext buildContext, @NotNull PlanRepositoryDefinition defaultRepositoryDef, @NotNull VcsRepositoryModuleDescriptor moduleDescriptor, @NotNull MergeResultContext mergeResult, @NotNull File mergeDir, @Nullable BuildLogger buildLogger, @NotNull Consumer<MergeResult> mergeResultConsumer, @NotNull Runnable afterMergeFinished) void
VcsBranchIntegrationHelper.mergeAndUpdateResult
(@NotNull BuildContext buildContext, @NotNull PlanRepositoryDefinition defaultRepositoryDef, @NotNull VcsRepositoryModuleDescriptor moduleDescriptor, @NotNull MergeResultContext mergeResult, @NotNull File mergeDir, @Nullable BuildLogger buildLogger, @NotNull Consumer<MergeResult> mergeResultConsumer, @NotNull Runnable afterMergeFinished)