golang/ent
1
0
Fork 0
mirror of https://github.com/ent/ent.git synced 2026-05-22 09:31:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

entc/internal: fix snapshot schema merge (#1022)

Browse Source
This commit is contained in:
BrentChesny
2020-12-07 13:06:23 +01:00
committed by GitHub
parent 79349fc88d
commit 59ffc461a3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
entc/internal/snapshot.go
View File

@@ -81,7 +81,7 @@ func (s *Snapshot) parseSnapshot(buf []byte) (*gen.Snapshot, error) {
return local, nil
}
// In case of merge-conflict, we merge the 2 schemas.
line, err = trim(matches[0])
line, err = trim(matches[1])
if err != nil {
return nil, err
}