Aws::CodeCommit::Model::Conflict Class Reference

#include <Conflict.h>

Public Member Functions
	Conflict ()
	Conflict (Aws::Utils::Json::JsonView jsonValue)
Conflict &	operator= (Aws::Utils::Json::JsonView jsonValue)
Aws::Utils::Json::JsonValue	Jsonize () const
const ConflictMetadata &	GetConflictMetadata () const
bool	ConflictMetadataHasBeenSet () const
void	SetConflictMetadata (const ConflictMetadata &value)
void	SetConflictMetadata (ConflictMetadata &&value)
Conflict &	WithConflictMetadata (const ConflictMetadata &value)
Conflict &	WithConflictMetadata (ConflictMetadata &&value)
const Aws::Vector< MergeHunk > &	GetMergeHunks () const
bool	MergeHunksHasBeenSet () const
void	SetMergeHunks (const Aws::Vector< MergeHunk > &value)
void	SetMergeHunks (Aws::Vector< MergeHunk > &&value)
Conflict &	WithMergeHunks (const Aws::Vector< MergeHunk > &value)
Conflict &	WithMergeHunks (Aws::Vector< MergeHunk > &&value)
Conflict &	AddMergeHunks (const MergeHunk &value)
Conflict &	AddMergeHunks (MergeHunk &&value)

Detailed Description

Information about conflicts in a merge operation.

See Also:

AWS API Reference

Definition at line 34 of file Conflict.h.

Constructor & Destructor Documentation

Conflict() [1/2]

Aws::CodeCommit::Model::Conflict::Conflict

(

)

Conflict() [2/2]

Aws::CodeCommit::Model::Conflict::Conflict

(

Aws::Utils::Json::JsonView

jsonValue

)

Member Function Documentation

AddMergeHunks() [1/2]

Conflict& Aws::CodeCommit::Model::Conflict::AddMergeHunks ( const MergeHunk &  value )

inline

A list of hunks that contain the differences between files or lines causing the conflict.

Definition at line 114 of file Conflict.h.

AddMergeHunks() [2/2]

Conflict& Aws::CodeCommit::Model::Conflict::AddMergeHunks ( MergeHunk &&  value )

inline

A list of hunks that contain the differences between files or lines causing the conflict.

Definition at line 120 of file Conflict.h.

ConflictMetadataHasBeenSet()

bool Aws::CodeCommit::Model::Conflict::ConflictMetadataHasBeenSet ( ) const

inline

Metadata about a conflict in a merge operation.

Definition at line 51 of file Conflict.h.

GetConflictMetadata()

const ConflictMetadata& Aws::CodeCommit::Model::Conflict::GetConflictMetadata ( ) const

inline

Metadata about a conflict in a merge operation.

Definition at line 46 of file Conflict.h.

GetMergeHunks()

const Aws::Vector<MergeHunk>& Aws::CodeCommit::Model::Conflict::GetMergeHunks ( ) const

inline

A list of hunks that contain the differences between files or lines causing the conflict.

Definition at line 78 of file Conflict.h.

Jsonize()

Aws::Utils::Json::JsonValue Aws::CodeCommit::Model::Conflict::Jsonize

(

)

const

MergeHunksHasBeenSet()

bool Aws::CodeCommit::Model::Conflict::MergeHunksHasBeenSet ( ) const

inline

A list of hunks that contain the differences between files or lines causing the conflict.

Definition at line 84 of file Conflict.h.

operator=()

Conflict& Aws::CodeCommit::Model::Conflict::operator=

(

Aws::Utils::Json::JsonView

jsonValue

)

SetConflictMetadata() [1/2]

void Aws::CodeCommit::Model::Conflict::SetConflictMetadata ( ConflictMetadata &&  value )

inline

Metadata about a conflict in a merge operation.

Definition at line 61 of file Conflict.h.

SetConflictMetadata() [2/2]

void Aws::CodeCommit::Model::Conflict::SetConflictMetadata ( const ConflictMetadata &  value )

inline

Metadata about a conflict in a merge operation.

Definition at line 56 of file Conflict.h.

SetMergeHunks() [1/2]

void Aws::CodeCommit::Model::Conflict::SetMergeHunks ( Aws::Vector< MergeHunk > &&  value )

inline

A list of hunks that contain the differences between files or lines causing the conflict.

Definition at line 96 of file Conflict.h.

SetMergeHunks() [2/2]

void Aws::CodeCommit::Model::Conflict::SetMergeHunks ( const Aws::Vector< MergeHunk > &  value )

inline

A list of hunks that contain the differences between files or lines causing the conflict.

Definition at line 90 of file Conflict.h.

WithConflictMetadata() [1/2]

Conflict& Aws::CodeCommit::Model::Conflict::WithConflictMetadata ( ConflictMetadata &&  value )

inline

Metadata about a conflict in a merge operation.

Definition at line 71 of file Conflict.h.

WithConflictMetadata() [2/2]

Conflict& Aws::CodeCommit::Model::Conflict::WithConflictMetadata ( const ConflictMetadata &  value )

inline

Metadata about a conflict in a merge operation.

Definition at line 66 of file Conflict.h.

WithMergeHunks() [1/2]

Conflict& Aws::CodeCommit::Model::Conflict::WithMergeHunks ( Aws::Vector< MergeHunk > &&  value )

inline

A list of hunks that contain the differences between files or lines causing the conflict.

Definition at line 108 of file Conflict.h.

WithMergeHunks() [2/2]

Conflict& Aws::CodeCommit::Model::Conflict::WithMergeHunks ( const Aws::Vector< MergeHunk > &  value )

inline

A list of hunks that contain the differences between files or lines causing the conflict.

Definition at line 102 of file Conflict.h.

---

The documentation for this class was generated from the following file:

• aws-cpp-sdk-codecommit/include/aws/codecommit/model/Conflict.h