From 1e1f23276af586ccacb7bee7f3a9ae81a8d900e4 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Wed, 13 Mar 2024 09:19:10 +0100
Subject: [PATCH] Added a script to update from upstream

---
 update_from_upstream.sh | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100755 update_from_upstream.sh

diff --git a/update_from_upstream.sh b/update_from_upstream.sh
new file mode 100755
index 000000000..23bd2a0fe
--- /dev/null
+++ b/update_from_upstream.sh
@@ -0,0 +1,4 @@
+#!/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