Skip to content

Commit a72ebc4

Browse files
committed
Avoid printing "automatic merge went well" message [skip ci]
1 parent f7d6625 commit a72ebc4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

scripts/propagate.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ for version in "${all_versions[@]}"; do
3333
if ! { echo "$version"; echo "$our_version"; } | sort --version-sort --check &>/dev/null; then
3434
echo -n "merging $our_version into ${version}... "
3535
git checkout -b propagations/$version origin/$version &>/dev/null
36-
if ! git merge --no-commit propagations/$our_version >/dev/null; then
36+
if ! git merge --no-commit propagations/$our_version &>/dev/null; then
3737
merge_failed=yes
3838
echo "failed, this merge must be done manually using the provided shell"
3939
else

0 commit comments

Comments
 (0)