mergeq 0.0.11 → 0.0.111

data/bin/mergeq.sh

@@ -96,7 +96,7 @@ function push_to_merge_branch {
   status "Merging into $merge_branch"
   git fetch origin $merge_branch
   git checkout -q FETCH_HEAD
-  git merge --no-ff -s ours --no-commit $current
+  git merge --no-ff -s theirs --no-commit $current
   echo $current > .merge
   git add .merge
   git commit -m "Queuing merge: $branch into $target_branch"

data/lib/mergeq/version.rb

@@ -1,3 +1,3 @@
 module Mergeq
-  VERSION = "0.0.11"
+  VERSION = "0.0.111"
 end

metadata

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