Uses of Class
org.craftercms.studio.api.v2.service.repository.MergeResult

Packages that use MergeResult

Package	Description
org.craftercms.studio.api.v2.service.repository
org.craftercms.studio.api.v2.service.repository.internal
org.craftercms.studio.controller.rest.v2
org.craftercms.studio.impl.v2.service.repository
org.craftercms.studio.impl.v2.service.repository.internal

Uses of MergeResult in org.craftercms.studio.api.v2.service.repository

Methods in org.craftercms.studio.api.v2.service.repository that return MergeResult

Modifier and Type	Method	Description
static MergeResult	MergeResult.failed()
static MergeResult	MergeResult.from(org.eclipse.jgit.api.PullResult pullResult, Collection<String> mergedCommits)
MergeResult	RepositoryManagementService.pullFromRemote(String siteId, String remoteName, String remoteBranch, String mergeStrategy)

Uses of MergeResult in org.craftercms.studio.api.v2.service.repository.internal

Methods in org.craftercms.studio.api.v2.service.repository.internal that return MergeResult

Modifier and Type	Method	Description
MergeResult	RepositoryManagementServiceInternal.pullFromRemote(String siteId, String remoteName, String remoteBranch, String mergeStrategy)

Uses of MergeResult in org.craftercms.studio.controller.rest.v2

Methods in org.craftercms.studio.controller.rest.v2 that return types with arguments of type MergeResult

Modifier and Type	Method	Description
ResultOne<MergeResult>	RepositoryManagementController.pullFromRemote(@Valid PullFromRemoteRequest pullFromRemoteRequest)

Uses of MergeResult in org.craftercms.studio.impl.v2.service.repository

Methods in org.craftercms.studio.impl.v2.service.repository that return MergeResult

Modifier and Type	Method	Description
MergeResult	RepositoryManagementServiceImpl.pullFromRemote(String siteId, String remoteName, String remoteBranch, String mergeStrategy)

Uses of MergeResult in org.craftercms.studio.impl.v2.service.repository.internal

Methods in org.craftercms.studio.impl.v2.service.repository.internal that return MergeResult

Modifier and Type	Method	Description
MergeResult	RepositoryManagementServiceInternalImpl.pullFromRemote(String siteId, String remoteName, String remoteBranch, String mergeStrategy)