AWS services or capabilities described in AWS Documentation may vary by region/location. Click Getting Started with Amazon AWS to see specific differences applicable to the China (Beijing) Region.

Class: Aws::CodeCommit::Types::MergePullRequestBySquashInput

Inherits:
Struct
  • Object
show all
Defined in:
gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb

Overview

Note:

When making an API call, you may pass MergePullRequestBySquashInput data as a 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
      },
    ],
  },
}

Constant Summary collapse

SENSITIVE =
[]

Instance Attribute Summary collapse

Instance Attribute Details

#author_nameString

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

Returns:

  • (String)


5522
5523
5524
5525
5526
5527
5528
5529
5530
5531
5532
5533
5534
5535
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 5522

class MergePullRequestBySquashInput < 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_messageString

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

Returns:

  • (String)


5522
5523
5524
5525
5526
5527
5528
5529
5530
5531
5532
5533
5534
5535
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 5522

class MergePullRequestBySquashInput < 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_levelString

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)


5522
5523
5524
5525
5526
5527
5528
5529
5530
5531
5532
5533
5534
5535
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 5522

class MergePullRequestBySquashInput < 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_resolutionTypes::ConflictResolution

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



5522
5523
5524
5525
5526
5527
5528
5529
5530
5531
5532
5533
5534
5535
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 5522

class MergePullRequestBySquashInput < 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_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 is successful.

Returns:

  • (String)


5522
5523
5524
5525
5526
5527
5528
5529
5530
5531
5532
5533
5534
5535
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 5522

class MergePullRequestBySquashInput < 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

#emailString

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

Returns:

  • (String)


5522
5523
5524
5525
5526
5527
5528
5529
5530
5531
5532
5533
5534
5535
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 5522

class MergePullRequestBySquashInput < 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_foldersBoolean

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)


5522
5523
5524
5525
5526
5527
5528
5529
5530
5531
5532
5533
5534
5535
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 5522

class MergePullRequestBySquashInput < 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_idString

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

Returns:

  • (String)


5522
5523
5524
5525
5526
5527
5528
5529
5530
5531
5532
5533
5534
5535
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 5522

class MergePullRequestBySquashInput < 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_nameString

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

Returns:

  • (String)


5522
5523
5524
5525
5526
5527
5528
5529
5530
5531
5532
5533
5534
5535
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 5522

class MergePullRequestBySquashInput < 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_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)


5522
5523
5524
5525
5526
5527
5528
5529
5530
5531
5532
5533
5534
5535
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 5522

class MergePullRequestBySquashInput < 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