(alpha update) fix make run logic in merge

Alpha update will now run the make targets ONLY
if the merge is completed without conflicts.

Author: vitorfloriano

pkg/cli/alpha/internal/update/update.go

@@ -346,18 +346,20 @@ func (opts *Update) mergeOriginalToUpgrade() error {
 				return fmt.Errorf("merge stopped due to conflicts")
 			}
 			log.Warn("Merge completed with conflicts. Conflict markers will be committed.")
+			log.Warn("After resolving the conflicts, run the following command:")
+			log.Warn("    make manifests generate fmt vet lint-fix")
+			log.Warn("This ensures manifests and generated files are up to date, and the project layout remains consistent.")
 		} else {
 			return fmt.Errorf("merge failed unexpectedly: %w", err)
 		}
 	}
 
 	if !hasConflicts {
 		log.Info("Merge happened without conflicts.")
+		// Best effort to run make targets to ensure the project is in a good state
+		runMakeTargets()
 	}
 
-	// Best effort to run make targets to ensure the project is in a good state
-	runMakeTargets()
-
 	// Step 4: Stage and commit
 	if err := exec.Command("git", "add", "--all").Run(); err != nil {
 		return fmt.Errorf("failed to stage merge results: %w", err)