mergeq 0.0.1111 → 0.0.1113

data/bin/mergeq.sh

@@ -96,7 +96,9 @@ function push_to_merge_branch {
   status "Merging into $merge_branch"
   git fetch origin $merge_branch
   git checkout -q FETCH_HEAD
-  git merge --no-ff --no-commit $current
+  git merge --no-ff -s ours --no-commit $current
+  # make the merge branch match exactly before committing the merge
+  # we do this so that bundle install will work when upgrading mergeq (ew)
   git checkout $current -- .
   echo $current > .merge
   git add .

data/lib/mergeq/version.rb

@@ -1,3 +1,3 @@
 module Mergeq
-  VERSION = "0.0.1111"
+  VERSION = "0.0.1113"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mergeq
 version: !ruby/object:Gem::Version
-  version: 0.0.1111
+  version: 0.0.1113
   prerelease: 
 platform: ruby
 authors: