Merge pull request #10 from nlharris/2025-02-09

2025 02 09

Author: nlharris

README.md

@@ -5,6 +5,8 @@ Migration of the OBF WP site to a static site generator (Hugo)
 ## Running hugo server locally
 
 ### Setting up a GitHub fork so you can make changes on your desktop
+(Instructions for those who are not git gurus)
+
 1. To make changes to web pages on your desktop and commit them from the command line to GH, you will need a
 [GitHub personal access token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens).
 2. Go to https://github.com/OBF/OBF.github.io and make a fork
@@ -14,14 +16,25 @@ git clone  https://github.com/YOUR_GITHUB_ID/OBF.github.io
 ```
 4. After you edit files on your desktop as desired, do:
 ```
+cd OBF.github.io
 git checkout -b BRANCH_NAME
 git add FILES
 git commit -m "my changes"
 git push    (or you might need to do git push --set-upstream origin BRANCH_NAME)
 ```
 
-4. Then go to https://github.com/YOUR_GITHUB_ID/OBF.github.io to make a PR
-5. Once the PR is merged, your changes should be visible on [https://obf.github.io/](https://obf.github.io/)
+5. Then go to https://github.com/YOUR_GITHUB_ID/OBF.github.io to make a PR
+6. Once the PR is merged, your changes should be visible on
+[https://obf.github.io/](https://obf.github.io/)
+
+8. Next time you want to make more changes, first update your local
+copy to pull in any changes others may have committed:
+```
+git checkout main
+git pull
+```
+Then do the steps in #4 (with a new branch name) to commit your changes.
+
 
 ### Using hugo
 0. Hugo documentation: https://gohugo.io/getting-started/quick-start/
@@ -44,3 +57,4 @@ hugo server &
 1. Create XML export of existing WP site with all pages & posts
 2. Run the conversion script [wp2hugo](https://github.com/ashishb/wp2hugo) in the following way `/wp2hugo -source obf.WordPress.2025-01-30.xml -output obf-test-hugo -download-media -continue-on-media-download-error`
 3. update the `hugo.yaml` to use the correct base page (as currently not deployed on open-bio.org)
+