Section 2.7e of CONTRIBUTING.md has code that will not work in terminal

[danvgar]

Overview

The code block for incorporating upstream changes at 2.7.e Working on an issue (5): Incorporating changes from upstream of website/CONTRIBUTING.md utilizes bash comments that may not run successfully on some operating systems or machines when copy-and-pasted. The comments need to be removed from this code block, and rewritten after the code-block for explanation purposes. .

Action Items

• Open website/CONTRIBUTING.md in your IDE
• Go to section "2.7.e Working on an issue (5): Incorporating changes from upstream"
• At each line of code, remove all text after and inclusive of the # symbols. These are comments that prevent the code from executing properly.
• Remove the following

```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.```

• Replace with the below

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 merge upstream-gh-pages
```

• With CONTRIBUTING.md still open, make a note of the section in which the replaced content appears, so that you will know where to look in the document to preview the change.
• Changes to CONTRIBUTING.md cannot be tested locally, rather they must be tested after pushing the issue branch to your fork of the repository. Push your issue branch in the usual manner, but before creating the Pull Request, check your updates using this test URL. Also store the test URL for use in a later step:

https://github.com/[REPLACE WITH GITHUB HANDLE]/website/blob/[REPLACE WITH NAME OF ISSUE BRANCH]/CONTRIBUTING.md

(for example: https://github.com/bonniewolfe/website/blob/issue-branch-1234/CONTRIBUTING.md)

• Create a pull request with your changes. In the Pull Request, after the "Why did you make the changes" section, add this line to help reviewers, replacing the text in brackets (and the brackets) with the test URL from the previous Action Item.

For Reviewers: Do not review changes locally, rather, review changes at [REPLACE WITH TEST URL]

Resources/Instructions

• CONTRIBUTING.md
• Getting started with writing and formatting on GitHub
• ER: Section 2.7e of CONTRIBUTING.md has code that will not work in terminal #6209