From 32a1898fc06d7cd75b144a7c9909fd3269578cc3 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Tue, 28 Sep 2021 17:26:53 +0200
Subject: [PATCH] Use new helpers in merge script

---
 merge_upstream.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/merge_upstream.sh b/merge_upstream.sh
index db2b383..fb876b9 100755
--- a/merge_upstream.sh
+++ b/merge_upstream.sh
@@ -16,19 +16,23 @@ forall_repos check_branch $branch
 # Ensure clean git state
 forall_repos check_clean_git
 
-# Automatic i18n reversion
-automatic_i18n_reversion
-
-# Merge
+# Fetch upstream
 forall_repos git fetch upstream
+
+# Automatic reversions
+automatic_i18n_reversion
+automatic_packagejson_reversion
+
+# Merge upstream
 forall_repos git merge upstream/master
 
 # Refresh environment
 make clean
 make setup
 
-# Automatic i18n adjustment
+# Automatic adjustments
 automatic_i18n_adjustment
+automatic_packagejson_adjustment
 
 # Automatic theme update
 pushd "matrix-react-sdk" > /dev/null