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

Inherits:

Struct

• Object
• Struct
• Aws::CodeCommit::Types::MergePullRequestByThreeWayInput

Includes:

Structure

Defined in:

lib/aws-sdk-codecommit/types.rb

Overview

See Also:

• AWS API Documentation

Constant Summary

SENSITIVE =

[]

Instance Attribute Summary

• #author_name ⇒ String

  The name of the author who created the commit.

• #commit_message ⇒ String

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

• #conflict_detail_level ⇒ String

  The level of conflict detail to use.

• #conflict_resolution ⇒ Types::ConflictResolution

  If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.

• #conflict_resolution_strategy ⇒ String

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

• #email ⇒ String

  The email address of the person merging the branches.

• #keep_empty_folders ⇒ Boolean

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

• #pull_request_id ⇒ String

  The system-generated ID of the pull request.

• #repository_name ⇒ String

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

• #source_commit_id ⇒ String

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

Instance Attribute Details

#author_name ⇒ String

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

Returns:

• (String)

# File 'lib/aws-sdk-codecommit/types.rb', line 5101

class MergePullRequestByThreeWayInput < Struct.new(
  :pull_request_id,
  :repository_name,
  :source_commit_id,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :commit_message,
  :author_name,
  :email,
  :keep_empty_folders,
  :conflict_resolution)
  SENSITIVE = []
  include Aws::Structure
end

#commit_message ⇒ String

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

Returns:

• (String)

# File 'lib/aws-sdk-codecommit/types.rb', line 5101

class MergePullRequestByThreeWayInput < Struct.new(
  :pull_request_id,
  :repository_name,
  :source_commit_id,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :commit_message,
  :author_name,
  :email,
  :keep_empty_folders,
  :conflict_resolution)
  SENSITIVE = []
  include Aws::Structure
end

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

Returns:

• (String)

# File 'lib/aws-sdk-codecommit/types.rb', line 5101

class MergePullRequestByThreeWayInput < Struct.new(
  :pull_request_id,
  :repository_name,
  :source_commit_id,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :commit_message,
  :author_name,
  :email,
  :keep_empty_folders,
  :conflict_resolution)
  SENSITIVE = []
  include Aws::Structure
end

#conflict_resolution ⇒ Types::ConflictResolution

If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.

Returns:

• (Types::ConflictResolution)

# File 'lib/aws-sdk-codecommit/types.rb', line 5101

class MergePullRequestByThreeWayInput < Struct.new(
  :pull_request_id,
  :repository_name,
  :source_commit_id,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :commit_message,
  :author_name,
  :email,
  :keep_empty_folders,
  :conflict_resolution)
  SENSITIVE = []
  include Aws::Structure
end

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

Returns:

• (String)

# File 'lib/aws-sdk-codecommit/types.rb', line 5101

class MergePullRequestByThreeWayInput < Struct.new(
  :pull_request_id,
  :repository_name,
  :source_commit_id,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :commit_message,
  :author_name,
  :email,
  :keep_empty_folders,
  :conflict_resolution)
  SENSITIVE = []
  include Aws::Structure
end

#email ⇒ String

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

Returns:

• (String)

# File 'lib/aws-sdk-codecommit/types.rb', line 5101

class MergePullRequestByThreeWayInput < Struct.new(
  :pull_request_id,
  :repository_name,
  :source_commit_id,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :commit_message,
  :author_name,
  :email,
  :keep_empty_folders,
  :conflict_resolution)
  SENSITIVE = []
  include Aws::Structure
end

#keep_empty_folders ⇒ Boolean

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.

Returns:

• (Boolean)

# File 'lib/aws-sdk-codecommit/types.rb', line 5101

class MergePullRequestByThreeWayInput < Struct.new(
  :pull_request_id,
  :repository_name,
  :source_commit_id,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :commit_message,
  :author_name,
  :email,
  :keep_empty_folders,
  :conflict_resolution)
  SENSITIVE = []
  include Aws::Structure
end

#pull_request_id ⇒ String

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

Returns:

• (String)

# File 'lib/aws-sdk-codecommit/types.rb', line 5101

class MergePullRequestByThreeWayInput < Struct.new(
  :pull_request_id,
  :repository_name,
  :source_commit_id,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :commit_message,
  :author_name,
  :email,
  :keep_empty_folders,
  :conflict_resolution)
  SENSITIVE = []
  include Aws::Structure
end

#repository_name ⇒ String

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

Returns:

• (String)

# File 'lib/aws-sdk-codecommit/types.rb', line 5101

class MergePullRequestByThreeWayInput < Struct.new(
  :pull_request_id,
  :repository_name,
  :source_commit_id,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :commit_message,
  :author_name,
  :email,
  :keep_empty_folders,
  :conflict_resolution)
  SENSITIVE = []
  include Aws::Structure
end

#source_commit_id ⇒ String

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)

# File 'lib/aws-sdk-codecommit/types.rb', line 5101

class MergePullRequestByThreeWayInput < Struct.new(
  :pull_request_id,
  :repository_name,
  :source_commit_id,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :commit_message,
  :author_name,
  :email,
  :keep_empty_folders,
  :conflict_resolution)
  SENSITIVE = []
  include Aws::Structure
end