github/schildichat-desktop
1
0
Fork 1
mirror of https://github.com/SchildiChat/schildichat-desktop.git synced 2025-03-28 19:12:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge-upstream.sh: Allow merging specific version

Browse Source
This commit is contained in:
su-ex 2023-07-31 15:11:53 +02:00
parent e68cd72772
commit 143bf7af1e
No known key found for this signature in database
GPG Key ID: D743C50C8B61984C
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
merge_upstream.sh
View File

@ -23,7 +23,13 @@ automatic_i18n_reversion
automatic_packagejson_reversion
# Merge upstream
get_latest_upstream_tag
# Check if specific version to merge passed
if [ -z "$1" ]; then
get_latest_upstream_tag
else
latest_upstream_tag="$1"
fi
forelement_repos git merge "$latest_upstream_tag"
get_current_mxsdk_tags