fix(ghpr): Ensure rebasing does not fail

craciunoiuc · craciunoiuc · commit 3dba9cb7126e · 2024-01-27T17:02:39.000+02:00
Signed-off-by: Cezar Craciunoiu &lt;cezar.craciunoiu@gmail.com&gt;
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)

Original file line number	Diff line number	Diff line change
`@@ -172,6 +172,8 @@ func NewPullRequestFromID(ctx context.Context, client *ghapi.GithubClient, ghOrg`
`172`	`172`	`"git",`
`173`	`173`	`"-C", pr.localRepo,`
`174`	`174`	`"rebase",`
	`175`	`+ "--merge",`
	`176`	`+ "--force-rebase",`
`175`	`177`	`fmt.Sprintf("origin/%s", pr.baseBranch),`
`176`	`178`	`)`
`177`	`179`	`rebase.Stdout = log.G(ctx).WriterLevel(logrus.ErrorLevel)`