Class: Aws::CodeCommit::Types::CreateUnreferencedMergeCommitInput

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

Overview

Note:

When making an API call, you may pass CreateUnreferencedMergeCommitInput data as a hash:

{
  repository_name: "RepositoryName", # required
  source_commit_specifier: "CommitName", # required
  destination_commit_specifier: "CommitName", # required
  merge_option: "FAST_FORWARD_MERGE", # required, accepts FAST_FORWARD_MERGE, SQUASH_MERGE, THREE_WAY_MERGE
  conflict_detail_level: "FILE_LEVEL", # accepts FILE_LEVEL, LINE_LEVEL
  conflict_resolution_strategy: "NONE", # accepts NONE, ACCEPT_SOURCE, ACCEPT_DESTINATION, AUTOMERGE
  author_name: "Name",
  email: "Email",
  commit_message: "Message",
  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 unreferenced commit. This information is used as both the author and committer for the commit.

Returns:

  • (String)

1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
# File 'lib/aws-sdk-codecommit/types.rb', line 1920

class CreateUnreferencedMergeCommitInput < Struct.new(
  :repository_name,
  :source_commit_specifier,
  :destination_commit_specifier,
  :merge_option,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :author_name,
  :email,
  :commit_message,
  :keep_empty_folders,
  :conflict_resolution)
  SENSITIVE = []
  include Aws::Structure
end

#commit_messageString

The commit message for the unreferenced commit.

Returns:

  • (String)

1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
# File 'lib/aws-sdk-codecommit/types.rb', line 1920

class CreateUnreferencedMergeCommitInput < Struct.new(
  :repository_name,
  :source_commit_specifier,
  :destination_commit_specifier,
  :merge_option,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :author_name,
  :email,
  :commit_message,
  :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)

1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
# File 'lib/aws-sdk-codecommit/types.rb', line 1920

class CreateUnreferencedMergeCommitInput < Struct.new(
  :repository_name,
  :source_commit_specifier,
  :destination_commit_specifier,
  :merge_option,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :author_name,
  :email,
  :commit_message,
  :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.


1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
# File 'lib/aws-sdk-codecommit/types.rb', line 1920

class CreateUnreferencedMergeCommitInput < Struct.new(
  :repository_name,
  :source_commit_specifier,
  :destination_commit_specifier,
  :merge_option,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :author_name,
  :email,
  :commit_message,
  :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)

1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
# File 'lib/aws-sdk-codecommit/types.rb', line 1920

class CreateUnreferencedMergeCommitInput < Struct.new(
  :repository_name,
  :source_commit_specifier,
  :destination_commit_specifier,
  :merge_option,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :author_name,
  :email,
  :commit_message,
  :keep_empty_folders,
  :conflict_resolution)
  SENSITIVE = []
  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)

1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
# File 'lib/aws-sdk-codecommit/types.rb', line 1920

class CreateUnreferencedMergeCommitInput < Struct.new(
  :repository_name,
  :source_commit_specifier,
  :destination_commit_specifier,
  :merge_option,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :author_name,
  :email,
  :commit_message,
  :keep_empty_folders,
  :conflict_resolution)
  SENSITIVE = []
  include Aws::Structure
end

#emailString

The email address for the person who created the unreferenced commit.

Returns:

  • (String)

1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
# File 'lib/aws-sdk-codecommit/types.rb', line 1920

class CreateUnreferencedMergeCommitInput < Struct.new(
  :repository_name,
  :source_commit_specifier,
  :destination_commit_specifier,
  :merge_option,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :author_name,
  :email,
  :commit_message,
  :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 this is specified as true, a .gitkeep file is created for empty folders. The default is false.

Returns:

  • (Boolean)

1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
# File 'lib/aws-sdk-codecommit/types.rb', line 1920

class CreateUnreferencedMergeCommitInput < Struct.new(
  :repository_name,
  :source_commit_specifier,
  :destination_commit_specifier,
  :merge_option,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :author_name,
  :email,
  :commit_message,
  :keep_empty_folders,
  :conflict_resolution)
  SENSITIVE = []
  include Aws::Structure
end

#merge_optionString

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

Returns:

  • (String)

1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
# File 'lib/aws-sdk-codecommit/types.rb', line 1920

class CreateUnreferencedMergeCommitInput < Struct.new(
  :repository_name,
  :source_commit_specifier,
  :destination_commit_specifier,
  :merge_option,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :author_name,
  :email,
  :commit_message,
  :keep_empty_folders,
  :conflict_resolution)
  SENSITIVE = []
  include Aws::Structure
end

#repository_nameString

The name of the repository where you want to create the unreferenced merge commit.

Returns:

  • (String)

1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
# File 'lib/aws-sdk-codecommit/types.rb', line 1920

class CreateUnreferencedMergeCommitInput < Struct.new(
  :repository_name,
  :source_commit_specifier,
  :destination_commit_specifier,
  :merge_option,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :author_name,
  :email,
  :commit_message,
  :keep_empty_folders,
  :conflict_resolution)
  SENSITIVE = []
  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)

1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
# File 'lib/aws-sdk-codecommit/types.rb', line 1920

class CreateUnreferencedMergeCommitInput < Struct.new(
  :repository_name,
  :source_commit_specifier,
  :destination_commit_specifier,
  :merge_option,
  :conflict_detail_level,
  :conflict_resolution_strategy,
  :author_name,
  :email,
  :commit_message,
  :keep_empty_folders,
  :conflict_resolution)
  SENSITIVE = []
  include Aws::Structure
end