always unset 'normal' on merge master
This commit is contained in:
parent
d6a562849c
commit
2ddba9924c
|
@ -60,6 +60,7 @@ func doMergeDevel() (*gitpb.Repos, error) {
|
||||||
func doMergeMaster() (*gitpb.Repos, error) {
|
func doMergeMaster() (*gitpb.Repos, error) {
|
||||||
var err error
|
var err error
|
||||||
me.forge.Config.Mode = forgepb.ForgeMode_MASTER // disable "normal" mode if set
|
me.forge.Config.Mode = forgepb.ForgeMode_MASTER // disable "normal" mode if set
|
||||||
|
configSave = true
|
||||||
done := gitpb.NewRepos()
|
done := gitpb.NewRepos()
|
||||||
found := findMergeToMaster()
|
found := findMergeToMaster()
|
||||||
for repo := range found.IterAll() {
|
for repo := range found.IterAll() {
|
||||||
|
|
Loading…
Reference in New Issue