Creepso/p-stream
1
0
Fork 0
mirror of https://github.com/p-stream/p-stream.git synced 2026-03-11 17:55:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update README.md

Browse source
This commit is contained in:
Pas 2025-04-15 16:21:53 -06:00 committed by GitHub
parent 261dec5650
commit d587285f34
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -42,11 +42,11 @@ To update a P-Stream instance you can type the below commands into a terminal at
```bash
git remote add upstream https://github.com/p-stream/p-stream.git
git fetch upstream # Grab the contents of the new remote source
git checkout <YOUR_MAIN_BRANCH> # Most likely this would be `origin/main`
git merge upstream/main
git checkout <YOUR_MAIN_BRANCH> # Most likely this would be `origin/production`
git merge upstream/production
# * Fix any conflicts present during merge *
git add . # Add all changes made during merge and conflict fixing
git commit -m "Update p-stream instance (merge upstream/main)"
git commit -m "Update p-stream instance (merge upstream/production)"
git push # Push to YOUR repository
```