public/atlantis
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/atlantis.git synced 2026-07-28 23:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update working_dir.go (#4048)

Browse Source 
fix mergeAgain function for when the PR is created from a fork
This commit is contained in:
Alan Bover
2023-12-13 16:06:04 +01:00
committed by GitHub
parent bcd91960db
commit da72b8366f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/events/working_dir.go
View File

@@ -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
}