lib/hu/deploy.rb in hu-1.4.7 vs lib/hu/deploy.rb in hu-1.4.8

@@ -147,16 +147,16 @@
 
         busy 'update working copy', :dots
         wc_update.join
         unbusy
 
-        unless develop_can_be_merged_into_master?
-          puts
-          puts "ERROR: It seems like a merge of 'develop' into 'master' would fail.".color(:red)
-          puts "       Aborting early to prevent a merge conflict.".color(:red)
-          puts
-          exit 1
-        end
+        # unless develop_can_be_merged_into_master?
+        #   puts
+        #   puts "ERROR: It seems like a merge of 'develop' into 'master' would fail.".color(:red)
+        #   puts "       Aborting early to prevent a merge conflict.".color(:red)
+        #   puts
+        #   exit 1
+        # end
 
         highest_version = find_highest_version_tag
         begin
           highest_versionomy = Versionomy.parse(highest_version)
         rescue