From 7c1861236a0645b173d5ed82aec371fa6c6c4779 Mon Sep 17 00:00:00 2001 From: Valics lehel Date: Sat, 6 Jan 2024 14:44:00 +0200 Subject: [PATCH] This script will keep your local modifications in chat.js and search.js, while also updating your branch with the latest changes from the remote repository. Remember to resolve any merge conflicts that might arise when you apply the stashed changes. --- update_repo.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 update_repo.sh diff --git a/update_repo.sh b/update_repo.sh new file mode 100644 index 00000000..f3d5026d --- /dev/null +++ b/update_repo.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +# This script will keep your local modifications in chat.js and search.js, +# while also updating your branch with the latest changes from the remote repository. +# Remember to resolve any merge conflicts that might arise when you apply the stashed changes. + +# Stage the modified files +git add dj_backend_server/web/static/chat.js +git add dj_backend_server/web/static/search.js + +# Fetch the latest updates from the remote repository +git fetch + +# Stash the staged changes +git stash + +# Pull the latest changes from the remote branch +git pull origin lvalics/OpenChat.git + +# Apply the stashed changes +git stash pop + +# End of script