solve conflict

docs/BranchCommit.md

@@ -3,12 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Sha** | **string** |  | [optional] [default to null]
 **Url** | **string** |  | [optional] [default to null]
-**Commit** | **string** |  | [optional] [default to null]
-**Author** | **string** |  | [optional] [default to null]
-**Parents** | **string** |  | [optional] [default to null]
-**Committer** | **string** |  | [optional] [default to null]
+**Sha** | **string** |  | [optional] [default to null]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

gitee/model_branch_commit.go

@@ -9,11 +9,8 @@
 
 package gitee
 
+// 分支commit info
 type BranchCommit struct {
-	Sha string `json:"sha,omitempty"`
 	Url string `json:"url,omitempty"`
-	Commit string `json:"commit,omitempty"`
-	Author string `json:"author,omitempty"`
-	Parents string `json:"parents,omitempty"`
-	Committer string `json:"committer,omitempty"`
+	Sha string `json:"sha,omitempty"`
 }