mirror of
https://github.com/RetroDECK/ES-DE.git
synced 2025-04-10 19:15:13 +00:00
Updated "update from upstream"script to fetch stable-3.2
This commit is contained in:
parent
7efa875fa2
commit
5701e666cf
|
@ -1,5 +1,5 @@
|
|||
#!/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
|
||||
echo -e "PLEASE CHECK IF ANYTHING IS CHANGED IN:\n-resources/systems/linux/es_find_rules.xml\n-resources/systems/linux/es_systems.xml"
|
Loading…
Reference in a new issue