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

Class: Aws::CodeCommit::Types::GetMergeCommitInput

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

Overview

Note:

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

{
  repository_name: "RepositoryName", # required
  source_commit_specifier: "CommitName", # required
  destination_commit_specifier: "CommitName", # required
  conflict_detail_level: "FILE_LEVEL", # accepts FILE_LEVEL, LINE_LEVEL
  conflict_resolution_strategy: "NONE", # accepts NONE, ACCEPT_SOURCE, ACCEPT_DESTINATION, AUTOMERGE
}

Instance Attribute Summary collapse

Instance Attribute Details

#conflict_detail_levelString

The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which will return a not mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict will be 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_strategyString

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 will be 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_specifierString

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.

#repository_nameString

The name of the repository that contains the merge commit about which you want to get information.

Returns:

  • (String)

    The name of the repository that contains the merge commit about which you want to get information.

#source_commit_specifierString

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.