Class DescribeMergeConflictsRequest
- All Implemented Interfaces:
SdkPojo
,ToCopyableBuilder<DescribeMergeConflictsRequest.Builder,
DescribeMergeConflictsRequest>
-
Nested Class Summary
-
Method Summary
Modifier and TypeMethodDescriptionbuilder()
The level of conflict detail to use.final String
The level of conflict detail to use.Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file.final String
Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file.final String
The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).final boolean
final boolean
equalsBySdkFields
(Object obj) Indicates whether some other object is "equal to" this one by SDK fields.final String
filePath()
The path of the target files used to describe the conflicts.final <T> Optional
<T> getValueForField
(String fieldName, Class<T> clazz) Used to retrieve the value of a field from any class that extendsSdkRequest
.final int
hashCode()
final Integer
The maximum number of merge hunks to include in the output.final MergeOptionTypeEnum
The merge option or strategy you want to use to merge the code.final String
The merge option or strategy you want to use to merge the code.final String
An enumeration token that, when provided in a request, returns the next batch of the results.final String
The name of the repository where you want to get information about a merge conflict.static Class
<? extends DescribeMergeConflictsRequest.Builder> final String
The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).Take this object and create a builder that contains all of the current property values of this object.final String
toString()
Returns a string representation of this object.Methods inherited from class software.amazon.awssdk.awscore.AwsRequest
overrideConfiguration
Methods inherited from interface software.amazon.awssdk.utils.builder.ToCopyableBuilder
copy
-
Method Details
-
repositoryName
The name of the repository where you want to get information about a merge conflict.
- Returns:
- The name of the repository where you want to get information about a merge conflict.
-
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).
- Returns:
- 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).
- Returns:
- The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).
-
mergeOption
The merge option or strategy you want to use to merge the code.
If the service returns an enum value that is not available in the current SDK version,
mergeOption
will returnMergeOptionTypeEnum.UNKNOWN_TO_SDK_VERSION
. The raw value returned by the service is available frommergeOptionAsString()
.- Returns:
- The merge option or strategy you want to use to merge the code.
- See Also:
-
mergeOptionAsString
The merge option or strategy you want to use to merge the code.
If the service returns an enum value that is not available in the current SDK version,
mergeOption
will returnMergeOptionTypeEnum.UNKNOWN_TO_SDK_VERSION
. The raw value returned by the service is available frommergeOptionAsString()
.- Returns:
- The merge option or strategy you want to use to merge the code.
- See Also:
-
maxMergeHunks
The maximum number of merge hunks to include in the output.
- Returns:
- The maximum number of merge hunks to include in the output.
-
filePath
The path of the target files used to describe the conflicts.
- Returns:
- The path of the target files used to describe the conflicts.
-
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.
If the service returns an enum value that is not available in the current SDK version,
conflictDetailLevel
will returnConflictDetailLevelTypeEnum.UNKNOWN_TO_SDK_VERSION
. The raw value returned by the service is available fromconflictDetailLevelAsString()
.- Returns:
- 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.
- See Also:
-
conflictDetailLevelAsString
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.
If the service returns an enum value that is not available in the current SDK version,
conflictDetailLevel
will returnConflictDetailLevelTypeEnum.UNKNOWN_TO_SDK_VERSION
. The raw value returned by the service is available fromconflictDetailLevelAsString()
.- Returns:
- 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.
- See Also:
-
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.
If the service returns an enum value that is not available in the current SDK version,
conflictResolutionStrategy
will returnConflictResolutionStrategyTypeEnum.UNKNOWN_TO_SDK_VERSION
. The raw value returned by the service is available fromconflictResolutionStrategyAsString()
.- Returns:
- 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.
- See Also:
-
conflictResolutionStrategyAsString
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.
If the service returns an enum value that is not available in the current SDK version,
conflictResolutionStrategy
will returnConflictResolutionStrategyTypeEnum.UNKNOWN_TO_SDK_VERSION
. The raw value returned by the service is available fromconflictResolutionStrategyAsString()
.- Returns:
- 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.
- See Also:
-
nextToken
An enumeration token that, when provided in a request, returns the next batch of the results.
- Returns:
- An enumeration token that, when provided in a request, returns the next batch of the results.
-
toBuilder
Description copied from interface:ToCopyableBuilder
Take this object and create a builder that contains all of the current property values of this object.- Specified by:
toBuilder
in interfaceToCopyableBuilder<DescribeMergeConflictsRequest.Builder,
DescribeMergeConflictsRequest> - Specified by:
toBuilder
in classCodeCommitRequest
- Returns:
- a builder for type T
-
builder
-
serializableBuilderClass
-
hashCode
public final int hashCode()- Overrides:
hashCode
in classAwsRequest
-
equals
- Overrides:
equals
in classAwsRequest
-
equalsBySdkFields
Description copied from interface:SdkPojo
Indicates whether some other object is "equal to" this one by SDK fields. An SDK field is a modeled, non-inherited field in anSdkPojo
class, and is generated based on a service model.If an
SdkPojo
class does not have any inherited fields,equalsBySdkFields
andequals
are essentially the same.- Specified by:
equalsBySdkFields
in interfaceSdkPojo
- Parameters:
obj
- the object to be compared with- Returns:
- true if the other object equals to this object by sdk fields, false otherwise.
-
toString
Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be redacted from this string using a placeholder value. -
getValueForField
Description copied from class:SdkRequest
Used to retrieve the value of a field from any class that extendsSdkRequest
. The field name specified should match the member name from the corresponding service-2.json model specified in the codegen-resources folder for a given service. The class specifies what class to cast the returned value to. If the returned value is also a modeled class, theSdkRequest.getValueForField(String, Class)
method will again be available.- Overrides:
getValueForField
in classSdkRequest
- Parameters:
fieldName
- The name of the member to be retrieved.clazz
- The class to cast the returned object to.- Returns:
- Optional containing the casted return value
-
sdkFields
-