diff --git a/server/events/working_dir.go b/server/events/working_dir.go index b4cc28f89f..886b3c4b40 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 }