no longer merge to master here
This commit is contained in:
parent
fd592e8222
commit
73c3969731
|
@ -89,7 +89,7 @@ func (r *repoWindow) repoMenu() *gui.Node {
|
|||
log.Info("filter dirty =", dirty.Checked())
|
||||
}
|
||||
|
||||
box2.NewButton("merge it all", func() {
|
||||
box2.NewButton("merge user to devel", func() {
|
||||
r.Disable()
|
||||
if IsAnythingDirty() {
|
||||
log.Info("You can't apply patches when repos are dirty")
|
||||
|
@ -99,9 +99,11 @@ func (r *repoWindow) repoMenu() *gui.Node {
|
|||
if !r.mergeAllUserToDevel() {
|
||||
return
|
||||
}
|
||||
/* no longer do this here! yay! long live forge
|
||||
if !r.mergeAllDevelToMain() {
|
||||
return
|
||||
}
|
||||
*/
|
||||
r.Enable()
|
||||
})
|
||||
|
||||
|
|
Loading…
Reference in New Issue