attempt to merge devel

control

@@ -3,6 +3,6 @@ Build-Depends: golang, protoc-gen-go, autogenpb, go-mod-clean
 Package: forge
 Maintainer: Jeff Carr <jcarr@wit.com>
 Architecture: amd64
-Depends:
+Depends: go-gui-toolkits
 Recommends: go-clone
 Description: 'forge' an attempt at federated 'git'

doGui.go

@@ -101,6 +101,10 @@ func drawWindow(win *gadgets.BasicWindow) {
 
 	// me.autoWorkingPwd = gadgets.NewOneLiner(grid, "working directory (pwd)")
 	me.goSrcPwd = gadgets.NewOneLiner(grid, "repo src home")
+	grid.NewLabel("")
+	me.demoB = grid.NewButton("Demo", func() {
+		log.Info("todo: put instructions here")
+	})
 	grid.NextRow()
 
 	usr, _ := user.Current()

structs.go

@@ -76,6 +76,7 @@ type mainType struct {
 	repoDirtyB      *gui.Node // "dirty" repos button
 	repoDevelMergeB *gui.Node // "merge to devel" repos button
 	repoWritableB   *gui.Node // "what repos are writable" repos button
+	demoB           *gui.Node // opens the demo
 
 	argvCheckoutUser   bool // shared between the GUI and the command line tools
 	argvCheckoutDevel  bool // shared between the GUI and the command line tools

windowRepoProblems.go

@@ -104,8 +104,12 @@ func makeRepoProblemsWindow() *repoProblemsWindow {
 				repo := all.Next()
 				mname := repo.GetMasterBranchName()
 				dname := repo.GetDevelBranchName()
-				cmd := []string{"git", "merge", mname, dname}
+				if dname != repo.GetCurrentBranchName() {
+					log.Info("Repo is not on the devel branch", repo.GetGoPath())
+				}
+				cmd := []string{"git", "merge", mname}
 				log.Info(repo.GetGoPath(), cmd)
+				repo.RunVerbose(cmd)
 			}
 		})
 		hbox.NewButton("test", func() {