speculator: Specify merge target

pull/977/head
Daniel Wagner-Hall 9 years ago
parent d6bdde4cee
commit a0cf485919

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

Loading…
Cancel
Save