You are viewing documentation for version 2 of the AWS SDK for Ruby. Version 3 documentation can be found here.

Class: Aws::CodeCommit::Types::DescribeMergeConflictsInput

Inherits:
Struct
  • Object
show all
Defined in:
(unknown)

Overview

Note:

When passing DescribeMergeConflictsInput as input to an Aws::Client method, you can use a vanilla Hash:

{
  repository_name: "RepositoryName", # required
  destination_commit_specifier: "CommitName", # required
  source_commit_specifier: "CommitName", # required
  merge_option: "FAST_FORWARD_MERGE", # required, accepts FAST_FORWARD_MERGE, SQUASH_MERGE, THREE_WAY_MERGE
  max_merge_hunks: 1,
  file_path: "Path", # required
  conflict_detail_level: "FILE_LEVEL", # accepts FILE_LEVEL, LINE_LEVEL
  conflict_resolution_strategy: "NONE", # accepts NONE, ACCEPT_SOURCE, ACCEPT_DESTINATION, AUTOMERGE
  next_token: "NextToken",
}

See Also:

Instance Attribute Summary collapse

Instance Attribute Details

#conflict_detail_level ⇒ String

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.

Possible values:

  • FILE_LEVEL
  • LINE_LEVEL

Returns:

  • (String) —

    The level of conflict detail to use.

#conflict_resolution_strategy ⇒ String

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.

Possible values:

  • NONE
  • ACCEPT_SOURCE
  • ACCEPT_DESTINATION
  • AUTOMERGE

Returns:

  • (String) —

    Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file.

#destination_commit_specifier ⇒ 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).

Returns:

  • (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).

#file_path ⇒ String

The path of the target files used to describe the conflicts.

Returns:

  • (String) —

    The path of the target files used to describe the conflicts.

#max_merge_hunks ⇒ Integer

The maximum number of merge hunks to include in the output.

Returns:

  • (Integer) —

    The maximum number of merge hunks to include in the output.

#merge_option ⇒ String

The merge option or strategy you want to use to merge the code.

Possible values:

  • FAST_FORWARD_MERGE
  • SQUASH_MERGE
  • THREE_WAY_MERGE

Returns:

  • (String) —

    The merge option or strategy you want to use to merge the code.

#next_token ⇒ String

An enumeration token that, when provided in a request, returns the next batch of the results.

Returns:

  • (String) —

    An enumeration token that, when provided in a request, returns the next batch of the results.

#repository_name ⇒ String

The name of the repository where you want to get information about a merge conflict.

Returns:

  • (String) —

    The name of the repository where you want to get information about a merge conflict.

#source_commit_specifier ⇒ 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).

Returns:

  • (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).