/* * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. * A copy of the License is located at * * http://aws.amazon.com/apache2.0 * * or in the "license" file accompanying this file. This file is distributed * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ /* * Do not modify this file. This file is generated from the codecommit-2015-04-13.normal.json service model. */ using System; using System.Collections.Generic; using System.Xml.Serialization; using System.Text; using System.IO; using System.Net; using Amazon.Runtime; using Amazon.Runtime.Internal; namespace Amazon.CodeCommit.Model { /// /// Information about conflicts in a merge operation. /// public partial class Conflict { private ConflictMetadata _conflictMetadata; private List _mergeHunks = new List(); /// /// Gets and sets the property ConflictMetadata. /// /// Metadata about a conflict in a merge operation. /// /// public ConflictMetadata ConflictMetadata { get { return this._conflictMetadata; } set { this._conflictMetadata = value; } } // Check to see if ConflictMetadata property is set internal bool IsSetConflictMetadata() { return this._conflictMetadata != null; } /// /// Gets and sets the property MergeHunks. /// /// A list of hunks that contain the differences between files or lines causing the conflict. /// /// public List MergeHunks { get { return this._mergeHunks; } set { this._mergeHunks = value; } } // Check to see if MergeHunks property is set internal bool IsSetMergeHunks() { return this._mergeHunks != null && this._mergeHunks.Count > 0; } } }