diff --git a/scripts/speculator/main.go b/scripts/speculator/main.go index 842d20b7..d807bf78 100644 --- a/scripts/speculator/main.go +++ b/scripts/speculator/main.go @@ -86,7 +86,7 @@ func gitFetchAndMerge(path string) error { if err := runGitCommand(path, []string{"fetch"}); err != nil { return err } - return runGitCommand(path, []string{"merge"}) + return runGitCommand(path, []string{"merge", "origin/master"}) } func runGitCommand(path string, args []string) error {