We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent f7d6625 commit a72ebc4Copy full SHA for a72ebc4
scripts/propagate.sh
@@ -33,7 +33,7 @@ for version in "${all_versions[@]}"; do
33
if ! { echo "$version"; echo "$our_version"; } | sort --version-sort --check &>/dev/null; then
34
echo -n "merging $our_version into ${version}... "
35
git checkout -b propagations/$version origin/$version &>/dev/null
36
- if ! git merge --no-commit propagations/$our_version >/dev/null; then
+ if ! git merge --no-commit propagations/$our_version &>/dev/null; then
37
merge_failed=yes
38
echo "failed, this merge must be done manually using the provided shell"
39
else
0 commit comments