R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 1.19.2 into 1.19.4

Browse Source
This commit is contained in:
embeddedt 2023-06-14 22:14:22 -04:00
commit fea1d35d08
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/propagate.sh
View File

@ -33,7 +33,7 @@ for version in "${all_versions[@]}"; do
if ! { echo "$version"; echo "$our_version"; } | sort --version-sort --check &>/dev/null; then if ! { echo "$version"; echo "$our_version"; } | sort --version-sort --check &>/dev/null; then
echo -n "merging $our_version into ${version}... " echo -n "merging $our_version into ${version}... "
git checkout -b propagations/$version origin/$version &>/dev/null git checkout -b propagations/$version origin/$version &>/dev/null
if ! git merge --no-commit propagations/$our_version >/dev/null; then if ! git merge --no-commit propagations/$our_version &>/dev/null; then
merge_failed=yes merge_failed=yes
echo "failed, this merge must be done manually using the provided shell" echo "failed, this merge must be done manually using the provided shell"
else else