Merge pull request #89 from matrix-org/daniel/speculator
speculator: Specify merge target
This commit is contained in:
commit
b7e98a263a
1 changed files with 1 additions and 1 deletions
|
@ -86,7 +86,7 @@ func gitFetchAndMerge(path string) error {
|
||||||
if err := runGitCommand(path, []string{"fetch"}); err != nil {
|
if err := runGitCommand(path, []string{"fetch"}); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
return runGitCommand(path, []string{"merge"})
|
return runGitCommand(path, []string{"merge", "origin/master"})
|
||||||
}
|
}
|
||||||
|
|
||||||
func runGitCommand(path string, args []string) error {
|
func runGitCommand(path string, args []string) error {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue