fix(ghpr): Remove redundant arguments

Signed-off-by: Cezar Craciunoiu <[email protected]>
unikraft · Jan 27, 2024 · b70f08d · b70f08d
1 parent 67ab299
commit b70f08d
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/internal/ghpr/ghpr.go b/internal/ghpr/ghpr.go
@@ -195,8 +195,6 @@ 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)