ES-DE/update_from_upstream.sh

#!/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
echo -e "PLEASE CHECK IF ANYTHING IS CHANGED IN:\n-resources/systems/linux/es_find_rules.xml\n-resources/systems/linux/es_systems.xml"
Added a script to update from upstream 2024-03-13 08:19:10 +00:00			`#!/bin/bash`

			`git fetch https://gitlab.com/es-de/emulationstation-de/ master # Fetch the latest changes from the remote master branch`
Merger script: added warning message 2024-03-17 09:24:27 +00:00			`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"`