dngg 0.0.7 → 0.0.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/dngg.rb +2 -2
- data/lib/dngg/command/merge.rb +8 -7
- data/lib/dngg/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: be0dd6c12a2cc8781b3c7828027f5b67bd83f78daf766f9f6a8d4ebf6bf54fc1
|
|
4
|
+
data.tar.gz: 31cbcf1c0f1d1f038fdefb657fe20ee90e6e8ca0530ee78c0124b056f9048dc5
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 3b1579fde8500f989b65ed7099a23219191ff47b3db321c084c341ed53be6e208e6091e2e5f09b50dbcf2cbab6136c5c55d86e17604a48d38b29153a83f3a90f
|
|
7
|
+
data.tar.gz: 83f6698ec58560949c3c628856f080cf007f7fc4b25b42ebb36bc957a8ac88cd1de7f1d5c5221b20aeec91059c26a85737808f1a73b40ec21a74e05909e08df3
|
data/Gemfile.lock
CHANGED
data/lib/dngg.rb
CHANGED
|
@@ -34,8 +34,8 @@ module DNGG
|
|
|
34
34
|
start_flow(branch, action)
|
|
35
35
|
end
|
|
36
36
|
|
|
37
|
-
desc 'merge <branch>
|
|
38
|
-
option :rebase, :default => false, :type => :boolean, aliases: '-r'
|
|
37
|
+
desc 'merge <branch>', 'Merge,开发完成后执行'
|
|
38
|
+
# option :rebase, :default => false, :type => :boolean, aliases: '-r'
|
|
39
39
|
def merge(branch)
|
|
40
40
|
rebase = options[:rebase]
|
|
41
41
|
merge_flow(branch, rebase)
|
data/lib/dngg/command/merge.rb
CHANGED
|
@@ -29,13 +29,14 @@ module DNGG
|
|
|
29
29
|
`git fetch | grep 'ignored'`
|
|
30
30
|
end
|
|
31
31
|
|
|
32
|
-
if need_rebase(branch) || force_rebase
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
else
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
end
|
|
32
|
+
# if need_rebase(branch) || force_rebase
|
|
33
|
+
# process_rebase(arry_conflict, branch)
|
|
34
|
+
# puts 'Tip: 主工程rebase模式'.blue
|
|
35
|
+
# else
|
|
36
|
+
# process_merge(arry_conflict, '主工程', branch)
|
|
37
|
+
# puts 'Tip: 主工程merge模式'.blue
|
|
38
|
+
# end
|
|
39
|
+
process_merge(arry_conflict, '主工程', branch)
|
|
39
40
|
|
|
40
41
|
if arry_conflict.size > 0
|
|
41
42
|
tip = "==> #{arry_conflict.size}个模块冲突："
|
data/lib/dngg/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: dngg
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.8
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- iSnow
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2021-08-
|
|
11
|
+
date: 2021-08-10 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: thor
|