From b70f08d4ef895470d9f533461aaaa815f0afd534 Mon Sep 17 00:00:00 2001 From: Cezar Craciunoiu Date: Sat, 27 Jan 2024 17:48:31 +0200 Subject: [PATCH] fix(ghpr): Remove redundant arguments Signed-off-by: Cezar Craciunoiu --- internal/ghpr/ghpr.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/ghpr/ghpr.go b/internal/ghpr/ghpr.go index 55d588c..6d07aee 100644 --- 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)