speculator: Specify merge target

9 years ago · a0cf485919
parent d6bdde4cee
commit a0cf485919
1 changed files with 1 additions and 1 deletions
--- 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 {