try merge to master also
This commit is contained in:
parent
fd41059087
commit
2856d88b12
8
doGui.go
8
doGui.go
|
@ -254,6 +254,14 @@ func drawWindow(win *gadgets.BasicWindow) {
|
||||||
// log.Info(strings.Join(r.Stderr, "\n"))
|
// log.Info(strings.Join(r.Stderr, "\n"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if repo.CheckoutMaster() {
|
||||||
|
log.Info("checkout master failed", repo.GetGoPath())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if _, err := repo.MergeToMaster(); err != nil {
|
||||||
|
log.Info("merge from devel failed", repo.GetGoPath(), err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue