Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-23 22:55:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merger script: added warning message

Browse source
This commit is contained in:
XargonWan 2024-03-17 10:24:27 +01:00
parent fb625f4018
commit 66c827fffc
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
update_from_upstream.sh
View file

@ -1,4 +1,5 @@
#!/bin/bash #!/bin/bash
git fetch https://gitlab.com/es-de/emulationstation-de/ master # Fetch the latest changes from the remote master branch 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 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"