Skip to content

Commit

Permalink
Replaced Broken Terminal Command With Working Terminal Commands in th…
Browse files Browse the repository at this point in the history
…e CONTRIBUTING.md file (#7776)

* Replaced broken code with working code

* Deleted comment on line 707
  • Loading branch information
dvernon5 authored Dec 1, 2024
1 parent fbd28bb commit e2ee3ed
Showing 1 changed file with 17 additions and 4 deletions.
21 changes: 17 additions & 4 deletions CONTRIBUTING.md
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

0 comments on commit e2ee3ed

Please sign in to comment.