merge

1 files changed, 7 insertions, 12 deletions

diff --git a/doMerge.go b/doMerge.go
index 5b45a4f..04e585d 100644
--- a/doMerge.go
+++ b/doMerge.go
@@ -52,19 +52,14 @@ func doMerge() error {
 		log.Printf("Merged %d master branches in %s\n", repos.Len(), shell.FormatDuration(dur))
 		okExit("")
 	}
-	repo := findCurrentPwdRepoOrDie()
-	if repo.GetCurrentBranchName() == repo.GetDevelBranchName() {
-		if _, err := repo.MergeToMaster(); err != nil {
-			log.Info("merge from devel 2 failed", repo.GetGoPath(), err)
-			badExit(err)
-		}
-		return nil
+	if showWorkRepos() {
+		// found some repos at least
+	} else {
+		// every repo is in a really clean state. no extra files anywhere
+		// no dirty repos, no repos that need to be published
+		// nothing different between user and master branch version. not common
+		log.Info("There does't seem to be anything to merge. Your repos are very consistent.")
 	}
-	if _, err := repo.MergeToDevel(); err != nil {
-		log.Info("merge from user 4 failed", repo.GetGoPath(), err)
-		badExit(err)
-	}
-	config.SetChanged("repos", true)
 	return nil
 }