Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-04-10 19:15:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated "update from upstream"script to fetch stable-3.2

Browse source
This commit is contained in:
XargonWan 2025-04-01 20:55:37 +09:00
parent 7efa875fa2
commit 5701e666cf
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
update_from_upstream.sh
View file

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
git fetch https://gitlab.com/es-de/emulationstation-de/ "3.1.1" # Fetch the latest changes from the remote master branch git fetch https://gitlab.com/es-de/emulationstation-de/ "stable-3.2" # 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" echo -e "PLEASE CHECK IF ANYTHING IS CHANGED IN:\n-resources/systems/linux/es_find_rules.xml\n-resources/systems/linux/es_systems.xml"