@Generated(value="com.amazonaws:aws-java-sdk-code-generator") public class MergeBranchesByThreeWayRequest extends AmazonWebServiceRequest implements Serializable, Cloneable
NOOP
Constructor and Description |
---|
MergeBranchesByThreeWayRequest() |
Modifier and Type | Method and Description |
---|---|
MergeBranchesByThreeWayRequest |
clone()
Creates a shallow clone of this object for all fields except the handler context.
|
boolean |
equals(Object obj) |
String |
getAuthorName()
The name of the author who created the commit.
|
String |
getCommitMessage()
The commit message to include in the commit information for the merge.
|
String |
getConflictDetailLevel()
The level of conflict detail to use.
|
ConflictResolution |
getConflictResolution()
If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a
merge.
|
String |
getConflictResolutionStrategy()
Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions
of a file.
|
String |
getDestinationCommitSpecifier()
The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name
or a full commit ID).
|
String |
getEmail()
The email address of the person merging the branches.
|
Boolean |
getKeepEmptyFolders()
If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders
empty.
|
String |
getRepositoryName()
The name of the repository where you want to merge two branches.
|
String |
getSourceCommitSpecifier()
The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name
or a full commit ID).
|
String |
getTargetBranch()
The branch where the merge is applied.
|
int |
hashCode() |
Boolean |
isKeepEmptyFolders()
If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders
empty.
|
void |
setAuthorName(String authorName)
The name of the author who created the commit.
|
void |
setCommitMessage(String commitMessage)
The commit message to include in the commit information for the merge.
|
void |
setConflictDetailLevel(String conflictDetailLevel)
The level of conflict detail to use.
|
void |
setConflictResolution(ConflictResolution conflictResolution)
If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a
merge.
|
void |
setConflictResolutionStrategy(String conflictResolutionStrategy)
Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions
of a file.
|
void |
setDestinationCommitSpecifier(String destinationCommitSpecifier)
The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name
or a full commit ID).
|
void |
setEmail(String email)
The email address of the person merging the branches.
|
void |
setKeepEmptyFolders(Boolean keepEmptyFolders)
If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders
empty.
|
void |
setRepositoryName(String repositoryName)
The name of the repository where you want to merge two branches.
|
void |
setSourceCommitSpecifier(String sourceCommitSpecifier)
The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name
or a full commit ID).
|
void |
setTargetBranch(String targetBranch)
The branch where the merge is applied.
|
String |
toString()
Returns a string representation of this object.
|
MergeBranchesByThreeWayRequest |
withAuthorName(String authorName)
The name of the author who created the commit.
|
MergeBranchesByThreeWayRequest |
withCommitMessage(String commitMessage)
The commit message to include in the commit information for the merge.
|
MergeBranchesByThreeWayRequest |
withConflictDetailLevel(ConflictDetailLevelTypeEnum conflictDetailLevel)
The level of conflict detail to use.
|
MergeBranchesByThreeWayRequest |
withConflictDetailLevel(String conflictDetailLevel)
The level of conflict detail to use.
|
MergeBranchesByThreeWayRequest |
withConflictResolution(ConflictResolution conflictResolution)
If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a
merge.
|
MergeBranchesByThreeWayRequest |
withConflictResolutionStrategy(ConflictResolutionStrategyTypeEnum conflictResolutionStrategy)
Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions
of a file.
|
MergeBranchesByThreeWayRequest |
withConflictResolutionStrategy(String conflictResolutionStrategy)
Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions
of a file.
|
MergeBranchesByThreeWayRequest |
withDestinationCommitSpecifier(String destinationCommitSpecifier)
The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name
or a full commit ID).
|
MergeBranchesByThreeWayRequest |
withEmail(String email)
The email address of the person merging the branches.
|
MergeBranchesByThreeWayRequest |
withKeepEmptyFolders(Boolean keepEmptyFolders)
If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders
empty.
|
MergeBranchesByThreeWayRequest |
withRepositoryName(String repositoryName)
The name of the repository where you want to merge two branches.
|
MergeBranchesByThreeWayRequest |
withSourceCommitSpecifier(String sourceCommitSpecifier)
The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name
or a full commit ID).
|
MergeBranchesByThreeWayRequest |
withTargetBranch(String targetBranch)
The branch where the merge is applied.
|
addHandlerContext, getCloneRoot, getCloneSource, getCustomQueryParameters, getCustomRequestHeaders, getGeneralProgressListener, getHandlerContext, getReadLimit, getRequestClientOptions, getRequestCredentials, getRequestCredentialsProvider, getRequestMetricCollector, getSdkClientExecutionTimeout, getSdkRequestTimeout, putCustomQueryParameter, putCustomRequestHeader, setGeneralProgressListener, setRequestCredentials, setRequestCredentialsProvider, setRequestMetricCollector, setSdkClientExecutionTimeout, setSdkRequestTimeout, withGeneralProgressListener, withRequestCredentialsProvider, withRequestMetricCollector, withSdkClientExecutionTimeout, withSdkRequestTimeout
public void setRepositoryName(String repositoryName)
The name of the repository where you want to merge two branches.
repositoryName
- The name of the repository where you want to merge two branches.public String getRepositoryName()
The name of the repository where you want to merge two branches.
public MergeBranchesByThreeWayRequest withRepositoryName(String repositoryName)
The name of the repository where you want to merge two branches.
repositoryName
- The name of the repository where you want to merge two branches.public void setSourceCommitSpecifier(String sourceCommitSpecifier)
The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).
sourceCommitSpecifier
- The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch
name or a full commit ID).public String getSourceCommitSpecifier()
The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).
public MergeBranchesByThreeWayRequest withSourceCommitSpecifier(String sourceCommitSpecifier)
The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).
sourceCommitSpecifier
- The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch
name or a full commit ID).public void setDestinationCommitSpecifier(String destinationCommitSpecifier)
The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).
destinationCommitSpecifier
- The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch
name or a full commit ID).public String getDestinationCommitSpecifier()
The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).
public MergeBranchesByThreeWayRequest withDestinationCommitSpecifier(String destinationCommitSpecifier)
The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).
destinationCommitSpecifier
- The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch
name or a full commit ID).public void setTargetBranch(String targetBranch)
The branch where the merge is applied.
targetBranch
- The branch where the merge is applied.public String getTargetBranch()
The branch where the merge is applied.
public MergeBranchesByThreeWayRequest withTargetBranch(String targetBranch)
The branch where the merge is applied.
targetBranch
- The branch where the merge is applied.public void setConflictDetailLevel(String conflictDetailLevel)
The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.
conflictDetailLevel
- The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a
not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a
conflict is considered not mergeable if the same file in both branches has differences on the same line.ConflictDetailLevelTypeEnum
public String getConflictDetailLevel()
The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.
ConflictDetailLevelTypeEnum
public MergeBranchesByThreeWayRequest withConflictDetailLevel(String conflictDetailLevel)
The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.
conflictDetailLevel
- The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a
not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a
conflict is considered not mergeable if the same file in both branches has differences on the same line.ConflictDetailLevelTypeEnum
public MergeBranchesByThreeWayRequest withConflictDetailLevel(ConflictDetailLevelTypeEnum conflictDetailLevel)
The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.
conflictDetailLevel
- The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a
not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a
conflict is considered not mergeable if the same file in both branches has differences on the same line.ConflictDetailLevelTypeEnum
public void setConflictResolutionStrategy(String conflictResolutionStrategy)
Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.
conflictResolutionStrategy
- Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two
versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the
merge operation is successful.ConflictResolutionStrategyTypeEnum
public String getConflictResolutionStrategy()
Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.
ConflictResolutionStrategyTypeEnum
public MergeBranchesByThreeWayRequest withConflictResolutionStrategy(String conflictResolutionStrategy)
Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.
conflictResolutionStrategy
- Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two
versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the
merge operation is successful.ConflictResolutionStrategyTypeEnum
public MergeBranchesByThreeWayRequest withConflictResolutionStrategy(ConflictResolutionStrategyTypeEnum conflictResolutionStrategy)
Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.
conflictResolutionStrategy
- Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two
versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the
merge operation is successful.ConflictResolutionStrategyTypeEnum
public void setAuthorName(String authorName)
The name of the author who created the commit. This information is used as both the author and committer for the commit.
authorName
- The name of the author who created the commit. This information is used as both the author and committer
for the commit.public String getAuthorName()
The name of the author who created the commit. This information is used as both the author and committer for the commit.
public MergeBranchesByThreeWayRequest withAuthorName(String authorName)
The name of the author who created the commit. This information is used as both the author and committer for the commit.
authorName
- The name of the author who created the commit. This information is used as both the author and committer
for the commit.public void setEmail(String email)
The email address of the person merging the branches. This information is used in the commit information for the merge.
email
- The email address of the person merging the branches. This information is used in the commit information
for the merge.public String getEmail()
The email address of the person merging the branches. This information is used in the commit information for the merge.
public MergeBranchesByThreeWayRequest withEmail(String email)
The email address of the person merging the branches. This information is used in the commit information for the merge.
email
- The email address of the person merging the branches. This information is used in the commit information
for the merge.public void setCommitMessage(String commitMessage)
The commit message to include in the commit information for the merge.
commitMessage
- The commit message to include in the commit information for the merge.public String getCommitMessage()
The commit message to include in the commit information for the merge.
public MergeBranchesByThreeWayRequest withCommitMessage(String commitMessage)
The commit message to include in the commit information for the merge.
commitMessage
- The commit message to include in the commit information for the merge.public void setKeepEmptyFolders(Boolean keepEmptyFolders)
If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If true, a .gitkeep file is created for empty folders. The default is false.
keepEmptyFolders
- If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the
folders empty. If true, a .gitkeep file is created for empty folders. The default is false.public Boolean getKeepEmptyFolders()
If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If true, a .gitkeep file is created for empty folders. The default is false.
public MergeBranchesByThreeWayRequest withKeepEmptyFolders(Boolean keepEmptyFolders)
If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If true, a .gitkeep file is created for empty folders. The default is false.
keepEmptyFolders
- If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the
folders empty. If true, a .gitkeep file is created for empty folders. The default is false.public Boolean isKeepEmptyFolders()
If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If true, a .gitkeep file is created for empty folders. The default is false.
public void setConflictResolution(ConflictResolution conflictResolution)
If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.
conflictResolution
- If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during
a merge.public ConflictResolution getConflictResolution()
If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.
public MergeBranchesByThreeWayRequest withConflictResolution(ConflictResolution conflictResolution)
If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.
conflictResolution
- If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during
a merge.public String toString()
toString
in class Object
Object.toString()
public MergeBranchesByThreeWayRequest clone()
AmazonWebServiceRequest
clone
in class AmazonWebServiceRequest
Object.clone()