Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-20 16:38:37 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

speculator: Specify merge target

Browse source
This commit is contained in:
Daniel Wagner-Hall 2015-10-09 10:43:27 +01:00
parent d6bdde4cee
commit a0cf485919
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/speculator/main.go
View file

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