braid 1.0.6 → 1.0.7

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.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/braid/operations.rb +1 -1
  3. data/lib/braid/version.rb +1 -1
  4. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 22c192bf298deec94e78ff118cbb19ab8fedc6e6
4
- data.tar.gz: cf7ab24e69fb9c3272e9fde0d71a93db16f4f289
3
+ metadata.gz: a0d928af57eb12abafbf54c343d68a5d594bf383
4
+ data.tar.gz: da0240947ea80a1b6feaf54e011da56ebb1ebb80
5
5
  SHA512:
6
- metadata.gz: 6a2aa594064557e3c0fb8d1ed7452f8607b98bb101fcf42a3b7265779ce0ea16168dbbeb69dcf74e5883a008d6c7ab4686015a28ecbebe236b95d592087d56ba
7
- data.tar.gz: 5d1cb3f00d03531dc5c5ca7319aa733bc36e55e1bdab40c11d49f52f22c0a680a40a6792d438e10f53fa8fbc93faf20c54f1cb1ee69c7127ce328d0d52c70611
6
+ metadata.gz: 1feb4f7d0dfaa63ba2ff3f02b0ff140dfd6b4b71e475bf8479d25a115dec1430319e26d85de4201c77c958b403854aa2b4606738697e6bc5a86de79d59c239c7
7
+ data.tar.gz: bad3e0410e64a2f5108559f853ec2b3580bd9158f2415f3bca6d5ee77ca2628d17c151be3347295d2d82d92aceb70df550bd0c54e93ea5ea082a75e618d96b73
data/lib/braid/operations.rb CHANGED
@@ -241,7 +241,7 @@ module Braid
241
241
 
242
242
  # Implies no commit.
243
243
  def merge_ours(opt)
244
- invoke(:merge, '-s ours --no-commit', opt)
244
+ invoke(:merge, '--allow-unrelated-histories -s ours --no-commit', opt)
245
245
  true
246
246
  end
247
247
 
data/lib/braid/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Braid
2
- VERSION = '1.0.6'
2
+ VERSION = '1.0.7'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: braid
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.6
4
+ version: 1.0.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Cristi Balan