fix_tsv_conflict 0.2.0 → 0.2.1
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/.travis.yml +5 -1
- data/lib/fix_tsv_conflict/resolver.rb +3 -3
- data/lib/fix_tsv_conflict/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: 39959f31c8ffbe3f09d65b53322d9b62495a5c5d158785799c05b16e683ce880
|
|
4
|
+
data.tar.gz: 7618bd91f585debc4412b75e361c7ef941ca06e45d83468f528acfb98d06c6c1
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 3697049d53e66266a2891cc1c2b33caa0b5d764939f5141b79a6d86f295f29f68895d573eed6c80f25a4a203ae0d4f8a096149e48909ce50ee8ec041a9150c5e
|
|
7
|
+
data.tar.gz: 335b32f5d964de1b081ab90fad33d1f5092f005b9435c01ac91a9f31ef2028b76aef83cfd6e803f14e53a56c8f03d2a006adad09b4774a84e1eb83643ee1c407
|
data/.travis.yml
CHANGED
|
@@ -39,8 +39,8 @@ module FixTSVConflict
|
|
|
39
39
|
|
|
40
40
|
def try(conflict)
|
|
41
41
|
result = []
|
|
42
|
-
left = index_by_id(conflict.left.reject
|
|
43
|
-
right = index_by_id(conflict.right.reject
|
|
42
|
+
left = index_by_id(conflict.left.reject { |l| l.blank? })
|
|
43
|
+
right = index_by_id(conflict.right.reject { |r| r.blank? })
|
|
44
44
|
(left.keys + right.keys).uniq.sort.each do |id|
|
|
45
45
|
l = left[id]
|
|
46
46
|
r = right[id]
|
|
@@ -59,7 +59,7 @@ module FixTSVConflict
|
|
|
59
59
|
|
|
60
60
|
def select(conflict)
|
|
61
61
|
text = <<-TEXT
|
|
62
|
-
Which do you want keep?
|
|
62
|
+
Which branch do you want to keep?
|
|
63
63
|
|
|
64
64
|
1) #{conflict.lbranch}
|
|
65
65
|
2) #{conflict.rbranch}
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: fix_tsv_conflict
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.2.
|
|
4
|
+
version: 0.2.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Masato Ikeda
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2018-02-
|
|
11
|
+
date: 2018-02-22 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|