lib/braid/operations.rb in braid-1.0.6 vs lib/braid/operations.rb in braid-1.0.7

@@ -239,10 +239,10 @@
         true
       end
 
       # 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
 
       # Implies no commit.
       def merge_subtree(opt)