braid 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0d928af57eb12abafbf54c343d68a5d594bf383
-  data.tar.gz: da0240947ea80a1b6feaf54e011da56ebb1ebb80
+  metadata.gz: f05634e9b4c3022e78ae6c0af53e9820e6cb3bf1
+  data.tar.gz: 73cf6f286841a8e37df2c6aa5d4692dc2a168106
 SHA512:
-  metadata.gz: 1feb4f7d0dfaa63ba2ff3f02b0ff140dfd6b4b71e475bf8479d25a115dec1430319e26d85de4201c77c958b403854aa2b4606738697e6bc5a86de79d59c239c7
-  data.tar.gz: bad3e0410e64a2f5108559f853ec2b3580bd9158f2415f3bca6d5ee77ca2628d17c151be3347295d2d82d92aceb70df550bd0c54e93ea5ea082a75e618d96b73
+  metadata.gz: 823414ff4155dabb3e432953a49f05d68a16b0e504dc8aa29dfd4cae45132d1c664cb935106af0a03ec5403e44b0c4f2bc90783fb2c51129674407dd25b42f01
+  data.tar.gz: 1667e256843a3026d249460ed8ad0faaceb6015008f860f29f8ef68c6c70528c3e0c8a37da0ea3c06ba293ad6d7711253f7e551ad2ccef406d3e7d167d8cb845

data/lib/braid/operations.rb

@@ -250,9 +250,8 @@ module Braid
         # TODO which options are needed?
         invoke(:merge, '-s subtree --no-commit --no-ff', opt)
         true
-      rescue ShellExecutionError
-        # TODO: Figure out how to pass along conflict messages.
-        raise MergeError, ''
+      rescue ShellExecutionError => error
+        raise MergeError, error.out
       end
 
       # Merge three trees (local_treeish should match the current state of the

data/lib/braid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: braid
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Cristi Balan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-29 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: braid
-rubygems_version: 2.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A simple tool for tracking vendor branches in git.