types/merge.go at master · willdot.net/tangled-fork

willdot.net / tangled-fork

Monorepo for Tangled

tangled-fork / types / merge.go

at master 22 lines 655 B view raw

 1package types
 2
 3type ConflictInfo struct {
 4	Filename string `json:"filename"`
 5	Reason   string `json:"reason"`
 6}
 7
 8type MergeCheckResponse struct {
 9	IsConflicted bool           `json:"is_conflicted"`
10	Conflicts    []ConflictInfo `json:"conflicts"`
11	Message      string         `json:"message"`
12	Error        string         `json:"error"`
13}
14
15type MergeRequest struct {
16	Patch         string `json:"patch"`
17	AuthorName    string `json:"authorName,omitempty"`
18	AuthorEmail   string `json:"authorEmail,omitempty"`
19	CommitBody    string `json:"commitBody,omitempty"`
20	CommitMessage string `json:"commitMessage,omitempty"`
21	Branch        string `json:"branch"`
22}