Update working_dir.go (runatlantis#4048)

fix mergeAgain function for when the PR is created from a fork
gocardless · Feb 13, 2024 · 6dc182e · 6dc182e
1 parent 166da89
commit 6dc182e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/server/events/working_dir.go b/server/events/working_dir.go
@@ -298,7 +298,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
 	}