class Aws::CodeCommit::Types::MergePullRequestBySquashInput
@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 }, ], }, }
@!attribute [rw] pull_request_id
The system-generated ID of the pull request. To get this ID, use ListPullRequests. @return [String]
@!attribute [rw] repository_name
The name of the repository where the pull request was created. @return [String]
@!attribute [rw] source_commit_id
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. @return [String]
@!attribute [rw] conflict_detail_level
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. @return [String]
@!attribute [rw] conflict_resolution_strategy
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. @return [String]
@!attribute [rw] commit_message
The commit message to include in the commit information for the merge. @return [String]
@!attribute [rw] author_name
The name of the author who created the commit. This information is used as both the author and committer for the commit. @return [String]
@!attribute [rw] email
The email address of the person merging the branches. This information is used in the commit information for the merge. @return [String]
@!attribute [rw] keep_empty_folders
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. @return [Boolean]
@!attribute [rw] conflict_resolution
If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge. @return [Types::ConflictResolution]
@see docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/MergePullRequestBySquashInput AWS API Documentation
Constants
- SENSITIVE