Skip to content
This repository has been archived by the owner on Jan 5, 2025. It is now read-only.

Commit

Permalink
This script will keep your local modifications in chat.js and search.js,
Browse files Browse the repository at this point in the history
 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.
  • Loading branch information
lvalics committed Jan 6, 2024
1 parent 8c2493f commit 7c18612
Showing 1 changed file with 23 additions and 0 deletions.
23 changes: 23 additions & 0 deletions update_repo.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 7c18612

Please sign in to comment.