Skip to content

Commit

Permalink
Switch to reset from rebase in rollouts upgrade script
Browse files Browse the repository at this point in the history
Signed-off-by: Jonathan West <[email protected]>
  • Loading branch information
jgwest committed Aug 16, 2024
1 parent 07d3485 commit e304669
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion hack/upgrade-rollouts-script/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ func createNewCommitAndBranch(latestReleaseVersionTag string, latestReleaseVersi
{"git", "stash"},
{"git", "fetch", "parent"},
{"git", "checkout", "main"},
{"git", "rebase", "parent/main"},
{"git", "reset", "--hard", "parent/main"},
{"git", "checkout", "-b", newBranchName},
}

Expand Down

0 comments on commit e304669

Please sign in to comment.