1# -------------------------------------------------------------------------------------------- 2# Copyright (c) Microsoft Corporation. All rights reserved. 3# Licensed under the MIT License. See License.txt in the project root for license information. 4# -------------------------------------------------------------------------------------------- 5# Generated file, DO NOT EDIT 6# Changes may cause incorrect behavior and will be lost if the code is regenerated. 7# -------------------------------------------------------------------------------------------- 8 9from msrest.serialization import Model 10 11 12class GitConflict(Model): 13 """GitConflict. 14 15 :param _links: 16 :type _links: :class:`ReferenceLinks <git.v4_0.models.ReferenceLinks>` 17 :param conflict_id: 18 :type conflict_id: int 19 :param conflict_path: 20 :type conflict_path: str 21 :param conflict_type: 22 :type conflict_type: object 23 :param merge_base_commit: 24 :type merge_base_commit: :class:`GitCommitRef <git.v4_0.models.GitCommitRef>` 25 :param merge_origin: 26 :type merge_origin: :class:`GitMergeOriginRef <git.v4_0.models.GitMergeOriginRef>` 27 :param merge_source_commit: 28 :type merge_source_commit: :class:`GitCommitRef <git.v4_0.models.GitCommitRef>` 29 :param merge_target_commit: 30 :type merge_target_commit: :class:`GitCommitRef <git.v4_0.models.GitCommitRef>` 31 :param resolution_error: 32 :type resolution_error: object 33 :param resolution_status: 34 :type resolution_status: object 35 :param resolved_by: 36 :type resolved_by: :class:`IdentityRef <git.v4_0.models.IdentityRef>` 37 :param resolved_date: 38 :type resolved_date: datetime 39 :param url: 40 :type url: str 41 """ 42 43 _attribute_map = { 44 '_links': {'key': '_links', 'type': 'ReferenceLinks'}, 45 'conflict_id': {'key': 'conflictId', 'type': 'int'}, 46 'conflict_path': {'key': 'conflictPath', 'type': 'str'}, 47 'conflict_type': {'key': 'conflictType', 'type': 'object'}, 48 'merge_base_commit': {'key': 'mergeBaseCommit', 'type': 'GitCommitRef'}, 49 'merge_origin': {'key': 'mergeOrigin', 'type': 'GitMergeOriginRef'}, 50 'merge_source_commit': {'key': 'mergeSourceCommit', 'type': 'GitCommitRef'}, 51 'merge_target_commit': {'key': 'mergeTargetCommit', 'type': 'GitCommitRef'}, 52 'resolution_error': {'key': 'resolutionError', 'type': 'object'}, 53 'resolution_status': {'key': 'resolutionStatus', 'type': 'object'}, 54 'resolved_by': {'key': 'resolvedBy', 'type': 'IdentityRef'}, 55 'resolved_date': {'key': 'resolvedDate', 'type': 'iso-8601'}, 56 'url': {'key': 'url', 'type': 'str'} 57 } 58 59 def __init__(self, _links=None, conflict_id=None, conflict_path=None, conflict_type=None, merge_base_commit=None, merge_origin=None, merge_source_commit=None, merge_target_commit=None, resolution_error=None, resolution_status=None, resolved_by=None, resolved_date=None, url=None): 60 super(GitConflict, self).__init__() 61 self._links = _links 62 self.conflict_id = conflict_id 63 self.conflict_path = conflict_path 64 self.conflict_type = conflict_type 65 self.merge_base_commit = merge_base_commit 66 self.merge_origin = merge_origin 67 self.merge_source_commit = merge_source_commit 68 self.merge_target_commit = merge_target_commit 69 self.resolution_error = resolution_error 70 self.resolution_status = resolution_status 71 self.resolved_by = resolved_by 72 self.resolved_date = resolved_date 73 self.url = url 74