mirror of
https://github.com/SchildiChat/schildichat-desktop.git
synced 2025-03-31 13:24:04 +02:00
merge-upstream.sh: Allow merging specific version
This commit is contained in:
parent
2fadcc908d
commit
d3d9d0351d
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user