Amazonka.CodeCommit.MergeBranchesBySquash

Merges two branches using the squash merge strategy.

Creating a Request

data MergeBranchesBySquash

See: newMergeBranchesBySquash smart constructor.

Constructors

MergeBranchesBySquash'

Fields

• authorName :: Maybe Text

  The name of the author who created the commit. This information is used as both the author and committer for the commit.

• commitMessage :: Maybe Text

  The commit message for the merge.

• conflictDetailLevel :: Maybe ConflictDetailLevelTypeEnum

  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.

• conflictResolution :: Maybe ConflictResolution

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

• conflictResolutionStrategy :: Maybe ConflictResolutionStrategyTypeEnum

  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.

• email :: Maybe Text

  The email address of the person merging the branches. This information is used in the commit information for the merge.

• keepEmptyFolders :: Maybe Bool

  If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If this is specified as true, a .gitkeep file is created for empty folders. The default is false.

• targetBranch :: Maybe Text

  The branch where the merge is applied.

• repositoryName :: Text

  The name of the repository where you want to merge two branches.

• sourceCommitSpecifier :: Text

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

• destinationCommitSpecifier :: Text

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

Instances

ToJSON MergeBranchesBySquash

Defined in Amazonka.CodeCommit.MergeBranchesBySquash

Methods

toJSON :: MergeBranchesBySquash -> Value

toEncoding :: MergeBranchesBySquash -> Encoding

toJSONList :: [MergeBranchesBySquash] -> Value

toEncodingList :: [MergeBranchesBySquash] -> Encoding

ToHeaders MergeBranchesBySquash

Defined in Amazonka.CodeCommit.MergeBranchesBySquash

Methods

toHeaders :: MergeBranchesBySquash -> [Header]

ToPath MergeBranchesBySquash

Defined in Amazonka.CodeCommit.MergeBranchesBySquash

Methods

toPath :: MergeBranchesBySquash -> ByteString

ToQuery MergeBranchesBySquash

Defined in Amazonka.CodeCommit.MergeBranchesBySquash

Methods

toQuery :: MergeBranchesBySquash -> QueryString

AWSRequest MergeBranchesBySquash

Defined in Amazonka.CodeCommit.MergeBranchesBySquash

Associated Types

type AWSResponse MergeBranchesBySquash

Methods

request :: (Service -> Service) -> MergeBranchesBySquash -> Request MergeBranchesBySquash

response :: MonadResource m => (ByteStringLazy -> IO ByteStringLazy) -> Service -> Proxy MergeBranchesBySquash -> ClientResponse ClientBody -> m (Either Error (ClientResponse (AWSResponse MergeBranchesBySquash)))

Generic MergeBranchesBySquash

Defined in Amazonka.CodeCommit.MergeBranchesBySquash

Associated Types

type Rep MergeBranchesBySquash :: Type -> Type

Methods

from :: MergeBranchesBySquash -> Rep MergeBranchesBySquash x

to :: Rep MergeBranchesBySquash x -> MergeBranchesBySquash

Read MergeBranchesBySquash

Defined in Amazonka.CodeCommit.MergeBranchesBySquash

Methods

readsPrec :: Int -> ReadS MergeBranchesBySquash

readList :: ReadS [MergeBranchesBySquash]

readPrec :: ReadPrec MergeBranchesBySquash

readListPrec :: ReadPrec [MergeBranchesBySquash]

Show MergeBranchesBySquash

Defined in Amazonka.CodeCommit.MergeBranchesBySquash

Methods

showsPrec :: Int -> MergeBranchesBySquash -> ShowS

show :: MergeBranchesBySquash -> String

showList :: [MergeBranchesBySquash] -> ShowS

NFData MergeBranchesBySquash

Defined in Amazonka.CodeCommit.MergeBranchesBySquash

Methods

rnf :: MergeBranchesBySquash -> ()

Eq MergeBranchesBySquash

Defined in Amazonka.CodeCommit.MergeBranchesBySquash

Methods

(==) :: MergeBranchesBySquash -> MergeBranchesBySquash -> Bool

(/=) :: MergeBranchesBySquash -> MergeBranchesBySquash -> Bool

Hashable MergeBranchesBySquash

Defined in Amazonka.CodeCommit.MergeBranchesBySquash

Methods

hashWithSalt :: Int -> MergeBranchesBySquash -> Int

hash :: MergeBranchesBySquash -> Int

type AWSResponse MergeBranchesBySquash

Defined in Amazonka.CodeCommit.MergeBranchesBySquash

type AWSResponse MergeBranchesBySquash = MergeBranchesBySquashResponse

type Rep MergeBranchesBySquash

Defined in Amazonka.CodeCommit.MergeBranchesBySquash

type Rep MergeBranchesBySquash = D1 ('MetaData "MergeBranchesBySquash" "Amazonka.CodeCommit.MergeBranchesBySquash" "amazonka-codecommit-2.0-974g5LOhuTPG9HgUSx02zG" 'False) (C1 ('MetaCons "MergeBranchesBySquash'" 'PrefixI 'True) (((S1 ('MetaSel ('Just "authorName") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe Text)) :*: S1 ('MetaSel ('Just "commitMessage") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe Text))) :*: (S1 ('MetaSel ('Just "conflictDetailLevel") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe ConflictDetailLevelTypeEnum)) :*: (S1 ('MetaSel ('Just "conflictResolution") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe ConflictResolution)) :*: S1 ('MetaSel ('Just "conflictResolutionStrategy") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe ConflictResolutionStrategyTypeEnum))))) :*: ((S1 ('MetaSel ('Just "email") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe Text)) :*: (S1 ('MetaSel ('Just "keepEmptyFolders") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe Bool)) :*: S1 ('MetaSel ('Just "targetBranch") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe Text)))) :*: (S1 ('MetaSel ('Just "repositoryName") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 Text) :*: (S1 ('MetaSel ('Just "sourceCommitSpecifier") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 Text) :*: S1 ('MetaSel ('Just "destinationCommitSpecifier") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 Text))))))

newMergeBranchesBySquash

Arguments

:: Text

MergeBranchesBySquash

-> Text

$sel:sourceCommitSpecifier:MergeBranchesBySquash'

-> Text

$sel:destinationCommitSpecifier:MergeBranchesBySquash'

-> MergeBranchesBySquash

Create a value of MergeBranchesBySquash with all optional fields omitted.

Use generic-lens or optics to modify other optional fields.

The following record fields are available, with the corresponding lenses provided for backwards compatibility:

$sel:authorName:MergeBranchesBySquash', mergeBranchesBySquash_authorName - The name of the author who created the commit. This information is used as both the author and committer for the commit.

$sel:commitMessage:MergeBranchesBySquash', mergeBranchesBySquash_commitMessage - The commit message for the merge.

$sel:conflictDetailLevel:MergeBranchesBySquash', mergeBranchesBySquash_conflictDetailLevel - 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.

$sel:conflictResolution:MergeBranchesBySquash', mergeBranchesBySquash_conflictResolution - If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.

$sel:conflictResolutionStrategy:MergeBranchesBySquash', mergeBranchesBySquash_conflictResolutionStrategy - 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.

MergeBranchesBySquash, mergeBranchesBySquash_email - The email address of the person merging the branches. This information is used in the commit information for the merge.

$sel:keepEmptyFolders:MergeBranchesBySquash', mergeBranchesBySquash_keepEmptyFolders - If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If this is specified as true, a .gitkeep file is created for empty folders. The default is false.

$sel:targetBranch:MergeBranchesBySquash', mergeBranchesBySquash_targetBranch - The branch where the merge is applied.

MergeBranchesBySquash, mergeBranchesBySquash_repositoryName - The name of the repository where you want to merge two branches.

$sel:sourceCommitSpecifier:MergeBranchesBySquash', mergeBranchesBySquash_sourceCommitSpecifier - The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).

$sel:destinationCommitSpecifier:MergeBranchesBySquash', mergeBranchesBySquash_destinationCommitSpecifier - The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).

Request Lenses

mergeBranchesBySquash_authorName :: Lens' MergeBranchesBySquash (Maybe Text)

The name of the author who created the commit. This information is used as both the author and committer for the commit.

mergeBranchesBySquash_commitMessage :: Lens' MergeBranchesBySquash (Maybe Text)

The commit message for the merge.

mergeBranchesBySquash_conflictDetailLevel :: Lens' MergeBranchesBySquash (Maybe ConflictDetailLevelTypeEnum)

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.

mergeBranchesBySquash_conflictResolution :: Lens' MergeBranchesBySquash (Maybe ConflictResolution)

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

mergeBranchesBySquash_conflictResolutionStrategy :: Lens' MergeBranchesBySquash (Maybe ConflictResolutionStrategyTypeEnum)

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.

mergeBranchesBySquash_email :: Lens' MergeBranchesBySquash (Maybe Text)

The email address of the person merging the branches. This information is used in the commit information for the merge.

mergeBranchesBySquash_keepEmptyFolders :: Lens' MergeBranchesBySquash (Maybe Bool)

If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If this is specified as true, a .gitkeep file is created for empty folders. The default is false.

mergeBranchesBySquash_targetBranch :: Lens' MergeBranchesBySquash (Maybe Text)

The branch where the merge is applied.

mergeBranchesBySquash_repositoryName :: Lens' MergeBranchesBySquash Text

The name of the repository where you want to merge two branches.

mergeBranchesBySquash_sourceCommitSpecifier :: Lens' MergeBranchesBySquash Text

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

mergeBranchesBySquash_destinationCommitSpecifier :: Lens' MergeBranchesBySquash Text

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

Destructuring the Response

data MergeBranchesBySquashResponse

See: newMergeBranchesBySquashResponse smart constructor.

Constructors

MergeBranchesBySquashResponse'

Fields

• commitId :: Maybe Text

  The commit ID of the merge in the destination or target branch.

• treeId :: Maybe Text

  The tree ID of the merge in the destination or target branch.

• httpStatus :: Int

  The response's http status code.

Instances

Generic MergeBranchesBySquashResponse

Defined in Amazonka.CodeCommit.MergeBranchesBySquash

Associated Types

type Rep MergeBranchesBySquashResponse :: Type -> Type

Methods

from :: MergeBranchesBySquashResponse -> Rep MergeBranchesBySquashResponse x

to :: Rep MergeBranchesBySquashResponse x -> MergeBranchesBySquashResponse

Read MergeBranchesBySquashResponse

Defined in Amazonka.CodeCommit.MergeBranchesBySquash

Methods

readsPrec :: Int -> ReadS MergeBranchesBySquashResponse

readList :: ReadS [MergeBranchesBySquashResponse]

readPrec :: ReadPrec MergeBranchesBySquashResponse

readListPrec :: ReadPrec [MergeBranchesBySquashResponse]

Show MergeBranchesBySquashResponse

Defined in Amazonka.CodeCommit.MergeBranchesBySquash

Methods

showsPrec :: Int -> MergeBranchesBySquashResponse -> ShowS

show :: MergeBranchesBySquashResponse -> String

showList :: [MergeBranchesBySquashResponse] -> ShowS

NFData MergeBranchesBySquashResponse

Defined in Amazonka.CodeCommit.MergeBranchesBySquash

Methods

rnf :: MergeBranchesBySquashResponse -> ()

Eq MergeBranchesBySquashResponse

Defined in Amazonka.CodeCommit.MergeBranchesBySquash

Methods

(==) :: MergeBranchesBySquashResponse -> MergeBranchesBySquashResponse -> Bool

(/=) :: MergeBranchesBySquashResponse -> MergeBranchesBySquashResponse -> Bool

type Rep MergeBranchesBySquashResponse

Defined in Amazonka.CodeCommit.MergeBranchesBySquash

type Rep MergeBranchesBySquashResponse = D1 ('MetaData "MergeBranchesBySquashResponse" "Amazonka.CodeCommit.MergeBranchesBySquash" "amazonka-codecommit-2.0-974g5LOhuTPG9HgUSx02zG" 'False) (C1 ('MetaCons "MergeBranchesBySquashResponse'" 'PrefixI 'True) (S1 ('MetaSel ('Just "commitId") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe Text)) :*: (S1 ('MetaSel ('Just "treeId") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe Text)) :*: S1 ('MetaSel ('Just "httpStatus") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 Int))))

newMergeBranchesBySquashResponse

Arguments

:: Int

$sel:httpStatus:MergeBranchesBySquashResponse'

-> MergeBranchesBySquashResponse

Create a value of MergeBranchesBySquashResponse with all optional fields omitted.

Use generic-lens or optics to modify other optional fields.

The following record fields are available, with the corresponding lenses provided for backwards compatibility:

MergeBranchesBySquashResponse, mergeBranchesBySquashResponse_commitId - The commit ID of the merge in the destination or target branch.

MergeBranchesBySquashResponse, mergeBranchesBySquashResponse_treeId - The tree ID of the merge in the destination or target branch.

$sel:httpStatus:MergeBranchesBySquashResponse', mergeBranchesBySquashResponse_httpStatus - The response's http status code.

Response Lenses

mergeBranchesBySquashResponse_commitId :: Lens' MergeBranchesBySquashResponse (Maybe Text)

The commit ID of the merge in the destination or target branch.

mergeBranchesBySquashResponse_treeId :: Lens' MergeBranchesBySquashResponse (Maybe Text)

The tree ID of the merge in the destination or target branch.

mergeBranchesBySquashResponse_httpStatus :: Lens' MergeBranchesBySquashResponse Int

The response's http status code.