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

Class: Aws::CodeCommit::Types::ConflictResolution

Inherits:
Struct
  • Object
show all
Defined in:
(unknown)

Overview

Note:

When passing ConflictResolution as input to an Aws::Client method, you can use a vanilla Hash:

{
  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
    },
  ],
}

A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.

Returned by:

Instance Attribute Summary collapse

Instance Attribute Details

#delete_filesArray<Types::DeleteFileEntry>

Files that will be deleted as part of the merge conflict resolution.

Returns:

#replace_contentsArray<Types::ReplaceContentEntry>

Files that will have content replaced as part of the merge conflict resolution.

Returns:

#set_file_modesArray<Types::SetFileModeEntry>

File modes that will be set as part of the merge conflict resolution.

Returns: