don't do these checks anymorev0.0.156

1 files changed, 8 insertions, 6 deletions

diff --git a/repo.merge.go b/repo.merge.go
index 3bdc3c5..3c3ae9c 100644
--- a/repo.merge.go
+++ b/repo.merge.go
@@ -12,9 +12,10 @@ func (r *Repo) MergeToDevel() (*cmd.Status, error) {
 	if r.CheckDirty() {
 		return nil, fmt.Errorf("repo is dirty")
 	}
-	if r.GetCurrentBranchName() != r.GetUserBranchName() {
-		return nil, fmt.Errorf("repo is not on user branch")
-	}
+	// not needed/wanted anymore?
+	// if r.GetCurrentBranchName() != r.GetUserBranchName() {
+	// 	return nil, fmt.Errorf("repo is not on user branch")
+	// }
 	if err := r.CheckoutDevelError(); err != nil {
 		log.Info("CheckoutDevelError()", err)
 		return nil, err
@@ -51,9 +52,10 @@ func (r *Repo) MergeToDevel() (*cmd.Status, error) {
 func (r *Repo) MergeToMaster() (*cmd.Status, error) {
 	r.ReloadCheck()
 
-	if r.GetCurrentBranchName() != r.GetDevelBranchName() {
-		return nil, fmt.Errorf("repo is not on devel branch")
-	}
+	// was this really needed?
+	// if r.GetCurrentBranchName() != r.GetDevelBranchName() {
+	// 	return nil, fmt.Errorf("repo is not on devel branch")
+	// }
 	if r.CheckDirty() {
 		return nil, fmt.Errorf("repo is dirty")
 	}