diff --git a/internal/ghpr/ghpr.go b/internal/ghpr/ghpr.go index d2ad6ee..fb7d33c 100644 --- 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)