Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replaced Broken Terminal Command With Working Terminal Commands in the CONTRIBUTING.md file #7776

Merged
merged 2 commits into from
Dec 1, 2024
Merged

Replaced Broken Terminal Command With Working Terminal Commands in the CONTRIBUTING.md file #7776

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4336db5
Replaced broken code with working code
dvernon5 Nov 28, 2024
3295b35
Deleted comment on line 707
dvernon5 Nov 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,11 +705,24 @@ 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 # 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 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 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.

Expand Down