dngg 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5df153f7aa9a80914809d7f3915339d1a77579cb7acb572ffa5587258b6ca4d5
-  data.tar.gz: 6cef40653c132cf070b9b68a497992249d91dcaf3798934cc936f361562c6a9d
+  metadata.gz: be0dd6c12a2cc8781b3c7828027f5b67bd83f78daf766f9f6a8d4ebf6bf54fc1
+  data.tar.gz: 31cbcf1c0f1d1f038fdefb657fe20ee90e6e8ca0530ee78c0124b056f9048dc5
 SHA512:
-  metadata.gz: 8def88976670a26691caf0bce996473421ee685cb8e380a04357f832f04485133178b9305d6be6feb0b66bcd97e5a62ab85421597a49c5b696ef9b3627705722
-  data.tar.gz: cc732898c05e77720cb1c8353ddadb221fdbc3a4e9f893d3702f7ba2cdf63cc68947be41519bbb37345cc8003147b4743b7b55aa7d00bf11b8ee92c8fe569b9d
+  metadata.gz: 3b1579fde8500f989b65ed7099a23219191ff47b3db321c084c341ed53be6e208e6091e2e5f09b50dbcf2cbab6136c5c55d86e17604a48d38b29153a83f3a90f
+  data.tar.gz: 83f6698ec58560949c3c628856f080cf007f7fc4b25b42ebb36bc957a8ac88cd1de7f1d5c5221b20aeec91059c26a85737808f1a73b40ec21a74e05909e08df3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dngg (0.0.7)
+    dngg (0.0.8)
       colorize (= 0.8.1)
       oj (= 3.8.0)
       thor (= 1.0.0)

data/lib/dngg.rb

@@ -34,8 +34,8 @@ module DNGG
       start_flow(branch, action)
     end
 
-    desc 'merge <branch> [-r|--rebase]', 'Merge,开发完成后执行; -r：主工程强制rebase'
-    option :rebase, :default => false, :type => :boolean, aliases: '-r'
+    desc 'merge <branch>', 'Merge,开发完成后执行'
+    # option :rebase, :default => false, :type => :boolean, aliases: '-r'
     def merge(branch)
       rebase = options[:rebase]
       merge_flow(branch, rebase)

data/lib/dngg/command/merge.rb

@@ -29,13 +29,14 @@ module DNGG
         `git fetch | grep 'ignored'`
       end
 
-      if need_rebase(branch) || force_rebase
-        process_rebase(arry_conflict, branch)
-        puts 'Tip: 主工程rebase模式'.blue
-      else
-        process_merge(arry_conflict, '主工程', branch)
-        puts 'Tip: 主工程merge模式'.blue
-      end
+      # if need_rebase(branch) || force_rebase
+      #   process_rebase(arry_conflict, branch)
+      #   puts 'Tip: 主工程rebase模式'.blue
+      # else
+      #   process_merge(arry_conflict, '主工程', branch)
+      #   puts 'Tip: 主工程merge模式'.blue
+      # end
+      process_merge(arry_conflict, '主工程', branch)
 
       if arry_conflict.size > 0
         tip = "==> #{arry_conflict.size}个模块冲突："

data/lib/dngg/version.rb

@@ -1,3 +1,3 @@
 module DNGG
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dngg
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - iSnow
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-04 00:00:00.000000000 Z
+date: 2021-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor