jcarr
/
forge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no longer merge to master here

This commit is contained in:
Jeff Carr 2025-01-07 03:23:35 -06:00
parent fd592e8222
commit 73c3969731
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
windowRepos.go
View File

@ -89,7 +89,7 @@ func (r *repoWindow) repoMenu() *gui.Node {
log.Info("filter dirty =", dirty.Checked()) log.Info("filter dirty =", dirty.Checked())
} }
box2.NewButton("merge it all", func() { box2.NewButton("merge user to devel", func() {
r.Disable() r.Disable()
if IsAnythingDirty() { if IsAnythingDirty() {
log.Info("You can't apply patches when repos are dirty") log.Info("You can't apply patches when repos are dirty")
@ -99,9 +99,11 @@ func (r *repoWindow) repoMenu() *gui.Node {
if !r.mergeAllUserToDevel() { if !r.mergeAllUserToDevel() {
return return
} }
/* no longer do this here! yay! long live forge
if !r.mergeAllDevelToMain() { if !r.mergeAllDevelToMain() {
return return
} }
*/
r.Enable() r.Enable()
}) })