class Aws::CodeCommit::Types::MergePullRequestBySquashInput

@see docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/MergePullRequestBySquashInput AWS API Documentation
@return [Types::ConflictResolution]
AUTOMERGE is chosen as the conflict resolution strategy.
A list of inputs to use when resolving conflicts during a merge if
@!attribute [rw] conflict_resolution
@return [Boolean]
folders. The default is false.
specified as true, a .gitkeep file will be created for empty
structure if the changes leave the folders empty. If this is
If the commit contains deletions, whether to keep a folder or folder
@!attribute [rw] keep_empty_folders
@return [String]
information will be used in the commit information for the merge.
The email address of the person merging the branches. This
@!attribute [rw] email
@return [String]
be used as both the author and committer for the commit.
The name of the author who created the commit. This information will
@!attribute [rw] author_name
@return [String]
merge.
The commit message to include in the commit information for the
@!attribute [rw] commit_message
@return [String]
the merge operation will be successful.
is NONE, which requires any conflicts to be resolved manually before
to attempt automatically merging two versions of a file. The default
Specifies which branch to use when resolving conflicts, or whether
@!attribute [rw] conflict_resolution_strategy
@return [String]
file in both branches has differences on the same line.
specified, a conflict will be considered not mergeable if the same
same file has differences in both branches. If LINE_LEVEL is
FILE_LEVEL is used, which will return a not mergeable result if the
The level of conflict detail to use. If unspecified, the default
@!attribute [rw] conflict_detail_level
@return [String]
not match this commit ID.
thrown if the current commit ID of the tip of the source branch does
request source branch. Pass this value if you want an exception
The full commit ID of the original or updated commit in the pull
@!attribute [rw] source_commit_id
@return [String]
The name of the repository where the pull request was created.
@!attribute [rw] repository_name
@return [String]
ListPullRequests.
The system-generated ID of the pull request. To get this ID, use
@!attribute [rw] pull_request_id
}
},
],
},
file_mode: “EXECUTABLE”, # required, accepts EXECUTABLE, NORMAL, SYMLINK
file_path: “Path”, # required
{
set_file_modes: [
],
},
file_path: “Path”, # required
{
delete_files: [
],
},
file_mode: “EXECUTABLE”, # accepts EXECUTABLE, NORMAL, SYMLINK
content: “data”,
replacement_type: “KEEP_BASE”, # required, accepts KEEP_BASE, KEEP_SOURCE, KEEP_DESTINATION, USE_NEW_CONTENT
file_path: “Path”, # required
{
replace_contents: [
conflict_resolution: {
keep_empty_folders: false,
email: “Email”,
author_name: “Name”,
commit_message: “Message”,
conflict_resolution_strategy: “NONE”, # accepts NONE, ACCEPT_SOURCE, ACCEPT_DESTINATION, AUTOMERGE
conflict_detail_level: “FILE_LEVEL”, # accepts FILE_LEVEL, LINE_LEVEL
source_commit_id: “ObjectId”,
repository_name: “RepositoryName”, # required
pull_request_id: “PullRequestId”, # required
{
data as a hash:
@note When making an API call, you may pass MergePullRequestBySquashInput