look for out of date remote branches

1 files changed, 9 insertions, 1 deletions

diff --git a/repo.merge.go b/repo.merge.go
index fe1e0ed..5dd65a2 100644
--- a/repo.merge.go
+++ b/repo.merge.go
@@ -58,7 +58,15 @@ func (r *Repo) MergeToMaster() (*cmd.Status, error) {
 	if r.GetReadOnly() {
 		r.Reload() // rescan the repo
 		// master branch is read only. you can not git push
-		return nil, fmt.Errorf("can't merge to master on read only() repos")
+		lh := r.GetLocalHash("devel")
+		rh := r.GetRemoteHash("devel")
+		if lh == rh {
+			// log.Info(r.FullPath, "local devel == remote devel", lh, rh)
+		} else {
+			log.Info(r.FullPath, "local devel != remote devel", lh, rh)
+		}
+		log.Info("can't merge to master on read only() repos. trying anyway")
+		// return nil, fmt.Errorf("can't merge to master on read only() repos")
 	}
 	if r.CheckDirty() {
 		return nil, fmt.Errorf("repo is dirty")