diff options
| author | Ryo Nihei <nihei.dev@gmail.com> | 2022-04-22 00:06:40 +0900 |
|---|---|---|
| committer | Ryo Nihei <nihei.dev@gmail.com> | 2022-04-22 00:09:08 +0900 |
| commit | 0f5c30198eae1777262aaa6c65d8b59875049beb (patch) | |
| tree | eea168df1a4aa584e2df3b607d405a2b7fcf8d79 /spec/description.go | |
| parent | vartan-show command prints only adopted actions when conflicts occur (diff) | |
| download | urubu-0f5c30198eae1777262aaa6c65d8b59875049beb.tar.gz urubu-0f5c30198eae1777262aaa6c65d8b59875049beb.tar.xz | |
Suppress a report about conflicts resolved explicitly
Diffstat (limited to 'spec/description.go')
| -rw-r--r-- | spec/description.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/description.go b/spec/description.go index ae56814..e82c509 100644 --- a/spec/description.go +++ b/spec/description.go @@ -44,6 +44,7 @@ type SRConflict struct { Production int `json:"production"` AdoptedState *int `json:"adopted_state"` AdoptedProduction *int `json:"adopted_production"` + ResolvedBy int `json:"resolved_by"` } type RRConflict struct { @@ -51,6 +52,7 @@ type RRConflict struct { Production1 int `json:"production_1"` Production2 int `json:"production_2"` AdoptedProduction int `json:"adopted_production"` + ResolvedBy int `json:"resolved_by"` } type State struct { |