Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Showing content from https://docs.aws.amazon.com/sdkforruby/api/Aws/CodeCommit/Types/ConflictResolution.html below:

ConflictResolution — AWS SDK for Ruby V2

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

Inherits:

Struct

• Object
• Struct
• Aws::CodeCommit::Types::ConflictResolution

show all

Defined in:

(unknown)

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

{
  replace_contents: [
    {
      file_path: "Path",       replacement_type: "KEEP_BASE",       content: "data",
      file_mode: "EXECUTABLE",     },
  ],
  delete_files: [
    {
      file_path: "Path",     },
  ],
  set_file_modes: [
    {
      file_path: "Path",       file_mode: "EXECUTABLE",     },
  ],
}

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

Returned by:

• Aws::CodeCommit::Types::CreateUnreferencedMergeCommitInput#conflict_resolution
• MergeBranchesBySquashInput#conflict_resolution
• MergeBranchesByThreeWayInput#conflict_resolution
• MergePullRequestBySquashInput#conflict_resolution
• MergePullRequestByThreeWayInput#conflict_resolution

• #delete_files ⇒ Array<Types::DeleteFileEntry>

  Files to be deleted as part of the merge conflict resolution.

• #replace_contents ⇒ Array<Types::ReplaceContentEntry>

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

• #set_file_modes ⇒ Array<Types::SetFileModeEntry>

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

RetroSearch is an open source project built by @garambo | Open a GitHub Issue

Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo

HTML: 3.2 | Encoding: UTF-8 | Version: 0.7.4