From 4336db5bdcbb44f47de48394145cac76beb6620e Mon Sep 17 00:00:00 2001 From: dvernon5 Date: Wed, 27 Nov 2024 17:01:49 -0800 Subject: [PATCH 1/2] Replaced broken code with working code --- CONTRIBUTING.md | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0c3d90546a..e827a3d875 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -704,12 +704,25 @@ git checkout -b upstream-gh-pages --track upstream/gh-pages ``` If you have already created the branch upstream-gh-pages, the following commands will incorporate upstream changes: + +1. Move to the branch you want to merge with. +```bash +git checkout upstream-gh-pages +``` + +2. Update your tracking branch with the latest changes from the `gh-pages` branch in this repository +```bash +git pull +``` + +3. Move back to your gh-pages branch +```bash +git checkout gh-pages +``` +4. Merge your changes back into your `gh-pages` branch. ```bash -git checkout upstream-gh-pages # Move to the branch you want to merge with. -git pull # This updates your tracking branch to match the gh-pages branch in this repository -git checkout gh-pages # Move back to your gh-pages branch -git merge upstream-gh-pages # Merge to bring your gh-pages current. +git merge upstream-gh-pages ``` If you do all your work on topic branches (as suggested above) and keep gh-pages free of local modifications, this merge should apply cleanly. From 3295b3582786bc5a66793c47980d6bccc4a56c8e Mon Sep 17 00:00:00 2001 From: dvernon5 Date: Fri, 29 Nov 2024 18:20:18 -0800 Subject: [PATCH 2/2] Deleted comment on line 707 --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e827a3d875..fcdc574af3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -704,7 +704,7 @@ git checkout -b upstream-gh-pages --track upstream/gh-pages ``` If you have already created the branch upstream-gh-pages, the following commands will incorporate upstream changes: - + 1. Move to the branch you want to merge with. ```bash git checkout upstream-gh-pages