class Aws::CodeCommit::Types::ConflictResolution

If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.

@note When making an API call, you may pass ConflictResolution

data as a 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
        },
      ],
    }

@!attribute [rw] replace_contents

Files to have content replaced as part of the merge conflict
resolution.
@return [Array<Types::ReplaceContentEntry>]

@!attribute [rw] delete_files

Files to be deleted as part of the merge conflict resolution.
@return [Array<Types::DeleteFileEntry>]

@!attribute [rw] set_file_modes

File modes that are set as part of the merge conflict resolution.
@return [Array<Types::SetFileModeEntry>]

@see docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/ConflictResolution AWS API Documentation

Constants

SENSITIVE