From da72b8366f5e01bffd773467448fd723b226b62c Mon Sep 17 00:00:00 2001 From: Alan Bover Date: Wed, 13 Dec 2023 16:06:04 +0100 Subject: [PATCH] Update working_dir.go (#4048) fix mergeAgain function for when the PR is created from a fork --- server/events/working_dir.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/events/working_dir.go b/server/events/working_dir.go index b4cc28f89..886b3c4b4 100644 --- a/server/events/working_dir.go +++ b/server/events/working_dir.go @@ -294,7 +294,7 @@ func (w *FileWorkspace) mergeAgain(c wrappedGitContext) error { } // Reset branch as if it was cloned again - if err := w.wrappedGit(c, "reset", "--hard", fmt.Sprintf("refs/remotes/head/%s", c.pr.BaseBranch)); err != nil { + if err := w.wrappedGit(c, "reset", "--hard", fmt.Sprintf("refs/remotes/origin/%s", c.pr.BaseBranch)); err != nil { return err }