From 59ffc461a35d5e4b3bb6b05ac19acc0dc0e7a408 Mon Sep 17 00:00:00 2001 From: BrentChesny Date: Mon, 7 Dec 2020 13:06:23 +0100 Subject: [PATCH] entc/internal: fix snapshot schema merge (#1022) --- entc/internal/snapshot.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entc/internal/snapshot.go b/entc/internal/snapshot.go index 6a56ddf62..e55d76f0d 100644 --- a/entc/internal/snapshot.go +++ b/entc/internal/snapshot.go @@ -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 }