diff --git a/pkg/cli/alpha/internal/update/helpers/open_gh_issue.go b/pkg/cli/alpha/internal/update/helpers/open_gh_issue.go index bad4b3953cb..a3ccd4d7a55 100644 --- a/pkg/cli/alpha/internal/update/helpers/open_gh_issue.go +++ b/pkg/cli/alpha/internal/update/helpers/open_gh_issue.go @@ -82,24 +82,25 @@ Create a Pull Request using the URL below to review the changes and resolve conf ## Next steps -### 1. Resolve conflicts -After fixing conflicts, run: +1. Fetch the **%[4]s** branch locally: + ~~~bash -make manifests generate fmt vet lint-fix +git fetch https://github.com/%[5]s %[4]s:%[4]s +git checkout %[4]s ~~~ -### 2. Optional: work on a new branch -To apply the update in a clean branch, run: +2. Locate and resolve the merge conflicts. + +3. After fixing conflicts, run: + ~~~bash -kubebuilder alpha update --output-branch my-fix-branch +make manifests generate fmt vet lint-fix ~~~ -This will create a new branch (my-fix-branch) with the update applied. -Resolve conflicts there, complete the merge locally, and push the branch. +4. Verify the changes: -### 3. Verify the changes -- Build the project -- Run tests +- Build the project +- Run tests - Confirm everything still works :book: **More info:** https://kubebuilder.io/reference/commands/alpha_update diff --git a/pkg/cli/alpha/internal/update/update.go b/pkg/cli/alpha/internal/update/update.go index 0a2922ac458..425535ec406 100644 --- a/pkg/cli/alpha/internal/update/update.go +++ b/pkg/cli/alpha/internal/update/update.go @@ -254,7 +254,7 @@ func (opts *Update) openGitHubIssue(hasConflicts bool) error { // Base issue body var body string if hasConflicts { - body = fmt.Sprintf(helpers.IssueBodyTmplWithConflicts, opts.ToVersion, createPRURL, opts.FromVersion, out) + body = fmt.Sprintf(helpers.IssueBodyTmplWithConflicts, opts.ToVersion, createPRURL, opts.FromVersion, out, repo) } else { body = fmt.Sprintf(helpers.IssueBodyTmpl, opts.ToVersion, createPRURL, opts.FromVersion, out) }