/* * Copyright 2018-2023 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. */ package com.amazonaws.services.codecommit.model; import java.io.Serializable; import javax.annotation.Generated; import com.amazonaws.protocol.StructuredPojo; import com.amazonaws.protocol.ProtocolMarshaller; /** *
* Information about conflicts in a merge operation. *
* * @see AWS API * Documentation */ @Generated("com.amazonaws:aws-java-sdk-code-generator") public class Conflict implements Serializable, Cloneable, StructuredPojo { /** ** Metadata about a conflict in a merge operation. *
*/ private ConflictMetadata conflictMetadata; /** ** A list of hunks that contain the differences between files or lines causing the conflict. *
*/ private java.util.List* Metadata about a conflict in a merge operation. *
* * @param conflictMetadata * Metadata about a conflict in a merge operation. */ public void setConflictMetadata(ConflictMetadata conflictMetadata) { this.conflictMetadata = conflictMetadata; } /** ** Metadata about a conflict in a merge operation. *
* * @return Metadata about a conflict in a merge operation. */ public ConflictMetadata getConflictMetadata() { return this.conflictMetadata; } /** ** Metadata about a conflict in a merge operation. *
* * @param conflictMetadata * Metadata about a conflict in a merge operation. * @return Returns a reference to this object so that method calls can be chained together. */ public Conflict withConflictMetadata(ConflictMetadata conflictMetadata) { setConflictMetadata(conflictMetadata); return this; } /** ** A list of hunks that contain the differences between files or lines causing the conflict. *
* * @return A list of hunks that contain the differences between files or lines causing the conflict. */ public java.util.List* A list of hunks that contain the differences between files or lines causing the conflict. *
* * @param mergeHunks * A list of hunks that contain the differences between files or lines causing the conflict. */ public void setMergeHunks(java.util.Collection* A list of hunks that contain the differences between files or lines causing the conflict. *
** NOTE: This method appends the values to the existing list (if any). Use * {@link #setMergeHunks(java.util.Collection)} or {@link #withMergeHunks(java.util.Collection)} if you want to * override the existing values. *
* * @param mergeHunks * A list of hunks that contain the differences between files or lines causing the conflict. * @return Returns a reference to this object so that method calls can be chained together. */ public Conflict withMergeHunks(MergeHunk... mergeHunks) { if (this.mergeHunks == null) { setMergeHunks(new java.util.ArrayList* A list of hunks that contain the differences between files or lines causing the conflict. *
* * @param mergeHunks * A list of hunks that contain the differences between files or lines causing the conflict. * @return Returns a reference to this object so that method calls can be chained together. */ public Conflict withMergeHunks(java.util.Collection