AWS SDK for C++
1.8.126
AWS SDK for C++
|
#include <ConflictResolution.h>
If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.
Definition at line 35 of file ConflictResolution.h.
Aws::CodeCommit::Model::ConflictResolution::ConflictResolution | ( | ) |
Aws::CodeCommit::Model::ConflictResolution::ConflictResolution | ( | Aws::Utils::Json::JsonView | jsonValue | ) |
|
inline |
Files to be deleted as part of the merge conflict resolution.
Definition at line 118 of file ConflictResolution.h.
|
inline |
Files to be deleted as part of the merge conflict resolution.
Definition at line 123 of file ConflictResolution.h.
|
inline |
Files to have content replaced as part of the merge conflict resolution.
Definition at line 77 of file ConflictResolution.h.
|
inline |
Files to have content replaced as part of the merge conflict resolution.
Definition at line 82 of file ConflictResolution.h.
|
inline |
File modes that are set as part of the merge conflict resolution.
Definition at line 159 of file ConflictResolution.h.
|
inline |
File modes that are set as part of the merge conflict resolution.
Definition at line 164 of file ConflictResolution.h.
|
inline |
Files to be deleted as part of the merge conflict resolution.
Definition at line 93 of file ConflictResolution.h.
|
inline |
Files to be deleted as part of the merge conflict resolution.
Definition at line 88 of file ConflictResolution.h.
|
inline |
Files to have content replaced as part of the merge conflict resolution.
Definition at line 47 of file ConflictResolution.h.
|
inline |
File modes that are set as part of the merge conflict resolution.
Definition at line 129 of file ConflictResolution.h.
Aws::Utils::Json::JsonValue Aws::CodeCommit::Model::ConflictResolution::Jsonize | ( | ) | const |
ConflictResolution& Aws::CodeCommit::Model::ConflictResolution::operator= | ( | Aws::Utils::Json::JsonView | jsonValue | ) |
|
inline |
Files to have content replaced as part of the merge conflict resolution.
Definition at line 52 of file ConflictResolution.h.
|
inline |
Files to be deleted as part of the merge conflict resolution.
Definition at line 103 of file ConflictResolution.h.
|
inline |
Files to be deleted as part of the merge conflict resolution.
Definition at line 98 of file ConflictResolution.h.
|
inline |
File modes that are set as part of the merge conflict resolution.
Definition at line 134 of file ConflictResolution.h.
|
inline |
Files to have content replaced as part of the merge conflict resolution.
Definition at line 62 of file ConflictResolution.h.
|
inline |
Files to have content replaced as part of the merge conflict resolution.
Definition at line 57 of file ConflictResolution.h.
|
inline |
File modes that are set as part of the merge conflict resolution.
Definition at line 144 of file ConflictResolution.h.
|
inline |
File modes that are set as part of the merge conflict resolution.
Definition at line 139 of file ConflictResolution.h.
|
inline |
Files to be deleted as part of the merge conflict resolution.
Definition at line 113 of file ConflictResolution.h.
|
inline |
Files to be deleted as part of the merge conflict resolution.
Definition at line 108 of file ConflictResolution.h.
|
inline |
Files to have content replaced as part of the merge conflict resolution.
Definition at line 72 of file ConflictResolution.h.
|
inline |
Files to have content replaced as part of the merge conflict resolution.
Definition at line 67 of file ConflictResolution.h.
|
inline |
File modes that are set as part of the merge conflict resolution.
Definition at line 154 of file ConflictResolution.h.
|
inline |
File modes that are set as part of the merge conflict resolution.
Definition at line 149 of file ConflictResolution.h.