mergeq 0.0.11 → 0.0.111
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/bin/mergeq.sh +1 -1
- data/lib/mergeq/version.rb +1 -1
- metadata +1 -1
data/bin/mergeq.sh
CHANGED
|
@@ -96,7 +96,7 @@ function push_to_merge_branch {
|
|
|
96
96
|
status "Merging into $merge_branch"
|
|
97
97
|
git fetch origin $merge_branch
|
|
98
98
|
git checkout -q FETCH_HEAD
|
|
99
|
-
git merge --no-ff -s
|
|
99
|
+
git merge --no-ff -s theirs --no-commit $current
|
|
100
100
|
echo $current > .merge
|
|
101
101
|
git add .merge
|
|
102
102
|
git commit -m "Queuing merge: $branch into $target_branch"
|
data/lib/mergeq/version.rb
CHANGED