fix(ghpr): Ensure rebasing does not fail

Signed-off-by: Cezar Craciunoiu <[email protected]>
unikraft · Jan 27, 2024 · 3dba9cb · 3dba9cb
1 parent 4153e3b
commit 3dba9cb
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/internal/ghpr/ghpr.go b/internal/ghpr/ghpr.go
@@ -172,6 +172,8 @@ func NewPullRequestFromID(ctx context.Context, client *ghapi.GithubClient, ghOrg
 		"git",
 		"-C", pr.localRepo,
 		"rebase",
+		"--merge",
+		"--force-rebase",
 		fmt.Sprintf("origin/%s", pr.baseBranch),
 	)
 	rebase.Stdout = log.G(ctx).WriterLevel(logrus.ErrorLevel)