diff --git a/_examples/type-system-extension/gqlgen.yml b/_examples/type-system-extension/gqlgen.yml
index bc7a31dba05..eba540c1f86 100644
--- a/_examples/type-system-extension/gqlgen.yml
+++ b/_examples/type-system-extension/gqlgen.yml
@@ -10,6 +10,3 @@ exec:
   filename: generated.go
 model:
   filename: models_gen.go
-resolver:
-  filename: resolver.go
-  type: Resolver
diff --git a/codegen/testserver/followschema/resolver.go b/codegen/testserver/followschema/resolver.go
index 94bd8816caa..7086a8abb1f 100644
--- a/codegen/testserver/followschema/resolver.go
+++ b/codegen/testserver/followschema/resolver.go
@@ -1,6 +1,6 @@
 package followschema
 
-// THIS CODE IS A STARTING POINT ONLY. IT WILL NOT BE UPDATED WITH SCHEMA CHANGES.
+// THIS CODE WILL BE UPDATED WITH SCHEMA CHANGES. PREVIOUS IMPLEMENTATION FOR SCHEMA CHANGES WILL BE KEPT IN THE COMMENT SECTION. IMPLEMENTATION FOR UNCHANGED SCHEMA WILL BE KEPT.
 
 import (
 	"context"
diff --git a/codegen/testserver/nullabledirectives/generated/resolvers/resolver.go b/codegen/testserver/nullabledirectives/generated/resolvers/resolver.go
index 7308cae6cb2..edb48796347 100644
--- a/codegen/testserver/nullabledirectives/generated/resolvers/resolver.go
+++ b/codegen/testserver/nullabledirectives/generated/resolvers/resolver.go
@@ -1,6 +1,6 @@
 package resolver
 
-// THIS CODE IS A STARTING POINT ONLY. IT WILL NOT BE UPDATED WITH SCHEMA CHANGES.
+// THIS CODE WILL BE UPDATED WITH SCHEMA CHANGES. PREVIOUS IMPLEMENTATION FOR SCHEMA CHANGES WILL BE KEPT IN THE COMMENT SECTION. IMPLEMENTATION FOR UNCHANGED SCHEMA WILL BE KEPT.
 
 import (
 	"context"
@@ -19,3 +19,13 @@ func (r *queryResolver) DirectiveSingleNullableArg(ctx context.Context, arg1 *st
 func (r *Resolver) Query() nullabledirectives.QueryResolver { return &queryResolver{r} }
 
 type queryResolver struct{ *Resolver }
+
+// !!! WARNING !!!
+// The code below was going to be deleted when updating resolvers. It has been copied here so you have
+// one last chance to move it out of harms way if you want. There are two reasons this happens:
+//  - When renaming or deleting a resolver the old code will be put in here. You can safely delete
+//    it when you're done.
+//  - You have helper methods in this file. Move them out to keep these resolver files clean.
+/*
+	type Resolver struct{}
+*/
diff --git a/codegen/testserver/singlefile/resolver.go b/codegen/testserver/singlefile/resolver.go
index 89a37561ab1..9fd76c6bb27 100644
--- a/codegen/testserver/singlefile/resolver.go
+++ b/codegen/testserver/singlefile/resolver.go
@@ -1,6 +1,6 @@
 package singlefile
 
-// THIS CODE IS A STARTING POINT ONLY. IT WILL NOT BE UPDATED WITH SCHEMA CHANGES.
+// THIS CODE WILL BE UPDATED WITH SCHEMA CHANGES. PREVIOUS IMPLEMENTATION FOR SCHEMA CHANGES WILL BE KEPT IN THE COMMENT SECTION. IMPLEMENTATION FOR UNCHANGED SCHEMA WILL BE KEPT.
 
 import (
 	"context"
diff --git a/integration/server/gqlgen.yml b/integration/server/gqlgen.yml
index 427490c7efc..9195079be1e 100644
--- a/integration/server/gqlgen.yml
+++ b/integration/server/gqlgen.yml
@@ -5,9 +5,6 @@ exec:
   filename: generated.go
 model:
   filename: models-go/generated.go
-resolver:
-  filename: resolver.go
-  type: Resolver
 
 struct_tag: json
 
diff --git a/plugin/resolvergen/resolver.go b/plugin/resolvergen/resolver.go
index 38138d52014..c0e040890b8 100644
--- a/plugin/resolvergen/resolver.go
+++ b/plugin/resolvergen/resolver.go
@@ -53,26 +53,44 @@ func (m *Plugin) GenerateCode(data *codegen.Data) error {
 
 func (m *Plugin) generateSingleFile(data *codegen.Data) error {
 	file := File{}
-
-	if _, err := os.Stat(data.Config.Resolver.Filename); err == nil {
-		// file already exists and we do not support updating resolvers with layout = single so just return
-		return nil
+	rewriter, err := rewrite.New(data.Config.Resolver.Dir())
+	if err != nil {
+		return err
 	}
 
 	for _, o := range data.Objects {
 		if o.HasResolvers() {
+			caser := cases.Title(language.English, cases.NoLower)
+			rewriter.MarkStructCopied(templates.LcFirst(o.Name) + templates.UcFirst(data.Config.Resolver.Type))
+			rewriter.GetMethodBody(data.Config.Resolver.Type, caser.String(o.Name))
+
 			file.Objects = append(file.Objects, o)
 		}
+
 		for _, f := range o.Fields {
 			if !f.IsResolver {
 				continue
 			}
 
-			resolver := Resolver{o, f, nil, "", `panic("not implemented")`, nil}
-			file.Resolvers = append(file.Resolvers, &resolver)
+			structName := templates.LcFirst(o.Name) + templates.UcFirst(data.Config.Resolver.Type)
+			comment := strings.TrimSpace(strings.TrimLeft(rewriter.GetMethodComment(structName, f.GoFieldName), `\`))
+			implementation := strings.TrimSpace(rewriter.GetMethodBody(structName, f.GoFieldName))
+			if implementation != "" {
+				resolver := Resolver{o, f, rewriter.GetPrevDecl(structName, f.GoFieldName), comment, implementation, nil}
+				file.Resolvers = append(file.Resolvers, &resolver)
+			} else {
+				resolver := Resolver{o, f, nil, "", `panic("not implemented")`, nil}
+				file.Resolvers = append(file.Resolvers, &resolver)
+			}
 		}
 	}
 
+	if _, err := os.Stat(data.Config.Resolver.Filename); err == nil {
+		file.name = data.Config.Resolver.Filename
+		file.imports = rewriter.ExistingImports(file.name)
+		file.RemainingSource = rewriter.RemainingSource(file.name)
+	}
+
 	resolverBuild := &ResolverBuild{
 		File:                &file,
 		PackageName:         data.Config.Resolver.Package,
@@ -88,7 +106,7 @@ func (m *Plugin) generateSingleFile(data *codegen.Data) error {
 
 	return templates.Render(templates.Options{
 		PackageName: data.Config.Resolver.Package,
-		FileNotice:  `// THIS CODE IS A STARTING POINT ONLY. IT WILL NOT BE UPDATED WITH SCHEMA CHANGES.`,
+		FileNotice:  `// THIS CODE WILL BE UPDATED WITH SCHEMA CHANGES. PREVIOUS IMPLEMENTATION FOR SCHEMA CHANGES WILL BE KEPT IN THE COMMENT SECTION. IMPLEMENTATION FOR UNCHANGED SCHEMA WILL BE KEPT.`,
 		Filename:    data.Config.Resolver.Filename,
 		Data:        resolverBuild,
 		Packages:    data.Config.Packages,
diff --git a/plugin/resolvergen/resolver.gotpl b/plugin/resolvergen/resolver.gotpl
index c25bd1d5627..ad6c1085819 100644
--- a/plugin/resolvergen/resolver.gotpl
+++ b/plugin/resolvergen/resolver.gotpl
@@ -48,5 +48,7 @@
 	//  - When renaming or deleting a resolver the old code will be put in here. You can safely delete
 	//    it when you're done.
 	//  - You have helper methods in this file. Move them out to keep these resolver files clean.
+	/*
 	{{ .RemainingSource }}
+	*/
 {{ end }}
diff --git a/plugin/resolvergen/testdata/singlefile/out/resolver.go b/plugin/resolvergen/testdata/singlefile/out/resolver.go
index 844b077c4ac..614c66cf18b 100644
--- a/plugin/resolvergen/testdata/singlefile/out/resolver.go
+++ b/plugin/resolvergen/testdata/singlefile/out/resolver.go
@@ -1,21 +1,22 @@
 package customresolver
 
-// THIS CODE IS A STARTING POINT ONLY. IT WILL NOT BE UPDATED WITH SCHEMA CHANGES.
+// THIS CODE WILL BE UPDATED WITH SCHEMA CHANGES. PREVIOUS IMPLEMENTATION FOR SCHEMA CHANGES WILL BE KEPT IN THE COMMENT SECTION. IMPLEMENTATION FOR UNCHANGED SCHEMA WILL BE KEPT.
 
 import (
 	"context"
+	"fmt"
 )
 
 type CustomResolverType struct{}
 
 // Resolver is the resolver for the resolver field.
 func (r *queryCustomResolverType) Resolver(ctx context.Context) (*Resolver, error) {
-	panic("not implemented")
+	panic(fmt.Errorf("not implemented: Resolver - resolver"))
 }
 
 // Name is the resolver for the name field.
 func (r *resolverCustomResolverType) Name(ctx context.Context, obj *Resolver) (string, error) {
-	panic("not implemented")
+	panic(fmt.Errorf("not implemented: Name - name"))
 }
 
 // Query returns QueryResolver implementation.