Update working_dir.go (#4048) (#4050)

fix mergeAgain function for when the PR is created from a fork Co-authored-by: Alan Bover <[email protected]>
runatlantis · Dec 20, 2023 · b4d8c3e · b4d8c3e
1 parent e118527
commit b4d8c3e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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
 	}