A RetroSearch Logo

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

Search Query:

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

GetMergeOptionsInput — 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.

Class: Aws::CodeCommit::Types::GetMergeOptionsInput
Inherits:
Struct show all
Defined in:
(unknown)
Overview Note:

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

{
  repository_name: "RepositoryName",   source_commit_specifier: "CommitName",   destination_commit_specifier: "CommitName",   conflict_detail_level: "FILE_LEVEL",   conflict_resolution_strategy: "NONE", }
Instance Attribute Summary collapse Instance Attribute Details #conflict_detail_level ⇒ String

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:

#conflict_resolution_strategy ⇒ String

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:

#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).

#repository_name ⇒ String

The name of the repository that contains the commits about which you want to get merge options.

#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).


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