Apply suggestions from code review

Co-authored-by: Luke Ghenco <lukeghenco@github.com>
Co-authored-by: Sameen Karim <skarim@github.com>

Author: skarim

cmd/modify.go

@@ -201,6 +201,10 @@ func runModifyAbort(cfg *config.Config) error {
 		cfg.Printf("Restoring stack to pre-modify state...")
 		if err := modify.UnwindFromStateFile(cfg, gitDir); err != nil {
 			cfg.Errorf("recovery failed: %s", err)
+			cfg.Printf("The stack may be in an inconsistent state.")
+			cfg.Printf("Try `%s` to fix, or `%s` + `%s` to recreate.", 
+			  cfg.ColorCyan("gh stack rebase"), cfg.ColorCyan("gh stack unstack --local"), 
+			  cfg.ColorCyan("gh stack init --adopt"))
 			return ErrSilent
 		}
 		cfg.Successf("Stack restored successfully")

cmd/submit.go

@@ -129,7 +129,7 @@ func runSubmit(cfg *config.Config, opts *submitOptions) error {
 		return nil
 	}
 
-	// If a modify is pending, delete the old remote stack first so that
+	// If a modification is pending, delete the old remote stack first so that
 	// PR base updates are allowed and force-pushes don't trigger auto-merges.
 	if stacksAvailable {
 		if err := handlePendingModify(cfg, client, s, gitDir); err != nil {