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

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

DescribeMergeConflictsInput — 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::DescribeMergeConflictsInput

show all

Defined in:

(unknown)

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

{
  repository_name: "RepositoryName",   destination_commit_specifier: "CommitName",   source_commit_specifier: "CommitName",   merge_option: "FAST_FORWARD_MERGE",   max_merge_hunks: 1,
  file_path: "Path",   conflict_detail_level: "FILE_LEVEL",   conflict_resolution_strategy: "NONE",   next_token: "NextToken",
}

• #conflict_detail_level ⇒ String

  The level of conflict detail to use.

• #conflict_resolution_strategy ⇒ String

  Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file.

• #destination_commit_specifier ⇒ String

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

• #file_path ⇒ String

  The path of the target files used to describe the conflicts.

• #max_merge_hunks ⇒ Integer

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

• #merge_option ⇒ String

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

• #next_token ⇒ String

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

• #repository_name ⇒ String

  The name of the repository where you want to get information about a merge conflict.

• #source_commit_specifier ⇒ String

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

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.

Possible values:

• FILE_LEVEL
• LINE_LEVEL

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.

Possible values:

• NONE
• ACCEPT_SOURCE
• ACCEPT_DESTINATION
• AUTOMERGE

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

The path of the target files used to describe the conflicts.

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

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

Possible values:

• FAST_FORWARD_MERGE
• SQUASH_MERGE
• THREE_WAY_MERGE

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

The name of the repository where you want to get information about a merge conflict.

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

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