braid 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22c192bf298deec94e78ff118cbb19ab8fedc6e6
-  data.tar.gz: cf7ab24e69fb9c3272e9fde0d71a93db16f4f289
+  metadata.gz: a0d928af57eb12abafbf54c343d68a5d594bf383
+  data.tar.gz: da0240947ea80a1b6feaf54e011da56ebb1ebb80
 SHA512:
-  metadata.gz: 6a2aa594064557e3c0fb8d1ed7452f8607b98bb101fcf42a3b7265779ce0ea16168dbbeb69dcf74e5883a008d6c7ab4686015a28ecbebe236b95d592087d56ba
-  data.tar.gz: 5d1cb3f00d03531dc5c5ca7319aa733bc36e55e1bdab40c11d49f52f22c0a680a40a6792d438e10f53fa8fbc93faf20c54f1cb1ee69c7127ce328d0d52c70611
+  metadata.gz: 1feb4f7d0dfaa63ba2ff3f02b0ff140dfd6b4b71e475bf8479d25a115dec1430319e26d85de4201c77c958b403854aa2b4606738697e6bc5a86de79d59c239c7
+  data.tar.gz: bad3e0410e64a2f5108559f853ec2b3580bd9158f2415f3bca6d5ee77ca2628d17c151be3347295d2d82d92aceb70df550bd0c54e93ea5ea082a75e618d96b73

data/lib/braid/operations.rb

@@ -241,7 +241,7 @@ module Braid
 
       # Implies no commit.
       def merge_ours(opt)
-        invoke(:merge, '-s ours --no-commit', opt)
+        invoke(:merge, '--allow-unrelated-histories -s ours --no-commit', opt)
         true
       end
 

data/lib/braid/version.rb

@@ -1,3 +1,3 @@
 module Braid
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: braid
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Cristi Balan