pstream is dead; long live pstream
taciturnaxolotl.github.io/pstream-ng/
Update README.md
+3
-3
+3
-3
README.md
+3
-3
README.md
···
42
42
```bash
43
43
git remote add upstream https://github.com/p-stream/p-stream.git
44
44
git fetch upstream # Grab the contents of the new remote source
45
-
git checkout <YOUR_MAIN_BRANCH> # Most likely this would be `origin/main`
46
-
git merge upstream/main
45
+
git checkout <YOUR_MAIN_BRANCH> # Most likely this would be `origin/production`
46
+
git merge upstream/production
47
47
# * Fix any conflicts present during merge *
48
48
git add . # Add all changes made during merge and conflict fixing
49
-
git commit -m "Update p-stream instance (merge upstream/main)"
49
+
git commit -m "Update p-stream instance (merge upstream/production)"
50
50
git push # Push to YOUR repository
51
51
```
52
52