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

Class: Aws::CodeCommit::Types::MergePullRequestByThreeWayInput

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

Overview

Note:

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

{
  pull_request_id: "PullRequestId", # required
  repository_name: "RepositoryName", # required
  source_commit_id: "ObjectId",
  conflict_detail_level: "FILE_LEVEL", # accepts FILE_LEVEL, LINE_LEVEL
  conflict_resolution_strategy: "NONE", # accepts NONE, ACCEPT_SOURCE, ACCEPT_DESTINATION, AUTOMERGE
  commit_message: "Message",
  author_name: "Name",
  email: "Email",
  keep_empty_folders: false,
  conflict_resolution: {
    replace_contents: [
      {
        file_path: "Path", # required
        replacement_type: "KEEP_BASE", # required, accepts KEEP_BASE, KEEP_SOURCE, KEEP_DESTINATION, USE_NEW_CONTENT
        content: "data",
        file_mode: "EXECUTABLE", # accepts EXECUTABLE, NORMAL, SYMLINK
      },
    ],
    delete_files: [
      {
        file_path: "Path", # required
      },
    ],
    set_file_modes: [
      {
        file_path: "Path", # required
        file_mode: "EXECUTABLE", # required, accepts EXECUTABLE, NORMAL, SYMLINK
      },
    ],
  },
}

Instance Attribute Summary collapse

Instance Attribute Details

#author_nameString

The name of the author who created the commit. This information will be used as both the author and committer for the commit.

Returns:

  • (String)

    The name of the author who created the commit.

#commit_messageString

The commit message to include in the commit information for the merge.

Returns:

  • (String)

    The commit message to include in the commit information for the merge.

#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_resolutionTypes::ConflictResolution

A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.

Returns:

  • (Types::ConflictResolution)

    A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.

#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.

#emailString

The email address of the person merging the branches. This information will be used in the commit information for the merge.

Returns:

  • (String)

    The email address of the person merging the branches.

#keep_empty_foldersBoolean

If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If this is specified as true, a .gitkeep file will be created for empty folders. The default is false.

Returns:

  • (Boolean)

    If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty.

#pull_request_idString

The system-generated ID of the pull request. To get this ID, use ListPullRequests.

Returns:

  • (String)

    The system-generated ID of the pull request.

#repository_nameString

The name of the repository where the pull request was created.

Returns:

  • (String)

    The name of the repository where the pull request was created.

#source_commit_idString

The full commit ID of the original or updated commit in the pull request source branch. Pass this value if you want an exception thrown if the current commit ID of the tip of the source branch does not match this commit ID.

Returns:

  • (String)

    The full commit ID of the original or updated commit in the pull request source branch.