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

Class: Aws::CodeCommit::Types::BatchDescribeMergeConflictsInput

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 BatchDescribeMergeConflictsInput data as a hash:

{
  repository_name: "RepositoryName", # required
  destination_commit_specifier: "CommitName", # required
  source_commit_specifier: "CommitName", # required
  merge_option: "FAST_FORWARD_MERGE", # required, accepts FAST_FORWARD_MERGE, SQUASH_MERGE, THREE_WAY_MERGE
  max_merge_hunks: 1,
  max_conflict_files: 1,
  file_paths: ["Path"],
  conflict_detail_level: "FILE_LEVEL", # accepts FILE_LEVEL, LINE_LEVEL
  conflict_resolution_strategy: "NONE", # accepts NONE, ACCEPT_SOURCE, ACCEPT_DESTINATION, AUTOMERGE
  next_token: "NextToken",
}

Instance Attribute Summary collapse

Instance Attribute Details

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

Returns:

  • (String)


104
105
106
107
108
109
110
111
112
113
114
115
116
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 104

class BatchDescribeMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option,
  :max_merge_hunks,
  :max_conflict_files,
  :file_paths,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :next_token)
  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 will be successful.

Returns:

  • (String)


104
105
106
107
108
109
110
111
112
113
114
115
116
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 104

class BatchDescribeMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option,
  :max_merge_hunks,
  :max_conflict_files,
  :file_paths,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :next_token)
  include Aws::Structure
end

#destination_commit_specifierString

The branch, tag, HEAD, or other fully qualified reference used to identify a commit. For example, a branch name or a full commit ID.

Returns:

  • (String)


104
105
106
107
108
109
110
111
112
113
114
115
116
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 104

class BatchDescribeMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option,
  :max_merge_hunks,
  :max_conflict_files,
  :file_paths,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :next_token)
  include Aws::Structure
end

#file_pathsArray<String>

The path of the target files used to describe the conflicts. If not specified, the default is all conflict files.

Returns:

  • (Array<String>)


104
105
106
107
108
109
110
111
112
113
114
115
116
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 104

class BatchDescribeMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option,
  :max_merge_hunks,
  :max_conflict_files,
  :file_paths,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :next_token)
  include Aws::Structure
end

#max_conflict_filesInteger

The maximum number of files to include in the output.

Returns:

  • (Integer)


104
105
106
107
108
109
110
111
112
113
114
115
116
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 104

class BatchDescribeMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option,
  :max_merge_hunks,
  :max_conflict_files,
  :file_paths,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :next_token)
  include Aws::Structure
end

#max_merge_hunksInteger

The maximum number of merge hunks to include in the output.

Returns:

  • (Integer)


104
105
106
107
108
109
110
111
112
113
114
115
116
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 104

class BatchDescribeMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option,
  :max_merge_hunks,
  :max_conflict_files,
  :file_paths,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :next_token)
  include Aws::Structure
end

#merge_optionString

The merge option or strategy you want to use to merge the code.

Returns:

  • (String)


104
105
106
107
108
109
110
111
112
113
114
115
116
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 104

class BatchDescribeMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option,
  :max_merge_hunks,
  :max_conflict_files,
  :file_paths,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :next_token)
  include Aws::Structure
end

#next_tokenString

An enumeration token that when provided in a request, returns the next batch of the results.

Returns:

  • (String)


104
105
106
107
108
109
110
111
112
113
114
115
116
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 104

class BatchDescribeMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option,
  :max_merge_hunks,
  :max_conflict_files,
  :file_paths,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :next_token)
  include Aws::Structure
end

#repository_nameString

The name of the repository that contains the merge conflicts you want to review.

Returns:

  • (String)


104
105
106
107
108
109
110
111
112
113
114
115
116
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 104

class BatchDescribeMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option,
  :max_merge_hunks,
  :max_conflict_files,
  :file_paths,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :next_token)
  include Aws::Structure
end

#source_commit_specifierString

The branch, tag, HEAD, or other fully qualified reference used to identify a commit. For example, a branch name or a full commit ID.

Returns:

  • (String)


104
105
106
107
108
109
110
111
112
113
114
115
116
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 104

class BatchDescribeMergeConflictsInput < Struct.new(
  :repository_name,
  :destination_commit_specifier,
  :source_commit_specifier,
  :merge_option,
  :max_merge_hunks,
  :max_conflict_files,
  :file_paths,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :next_token)
  include Aws::Structure
end