public String getConflictResolutionStrategy() {
        return this.conflictResolutionStrategy;
    }
<p>
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.
</p>

@return 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.
@see ConflictResolutionStrategyTypeEnum
aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/MergePullRequestByThreeWayRequest.java