From 66c827fffc12c19c00907a9f42b6cdb460353daf Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 17 Mar 2024 10:24:27 +0100 Subject: [PATCH] Merger script: added warning message --- update_from_upstream.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/update_from_upstream.sh b/update_from_upstream.sh index 23bd2a0fe..c2e64cfff 100755 --- a/update_from_upstream.sh +++ b/update_from_upstream.sh @@ -1,4 +1,5 @@ #!/bin/bash git fetch https://gitlab.com/es-de/emulationstation-de/ master # Fetch the latest changes from the remote master branch -git merge FETCH_HEAD # Merge the fetched changes into your current branch \ No newline at end of file +git merge FETCH_HEAD # Merge the fetched changes into your current branch +echo -e "PLEASE CHECK IF ANYTHING IS CHANGED IN:\n-resources/systems/linux/es_find_rules.xml\n-resources/systems/linux/es_systems.xml" \ No newline at end of file