Skip to content

Commit

Permalink
Update git instructions in contributing.md
Browse files Browse the repository at this point in the history
Former-commit-id: b092110a9d505488bbb4f4da8938563ce7d85db0
  • Loading branch information
jameshalgren authored Aug 26, 2020
1 parent 506b3f1 commit 011b4d7
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,24 +44,23 @@ before submitting any pull requests.
git clone github.com/<githubusername>/t-route.git
```

* Make your changes to the source files
* Make a new branch and make your changes to the source files in the branch

* Add changed files to the commit ... `git add <list of your changed files>`

* ... and commit them: `git commit`

* Push the accumulated commits to your fork in GitHub: `git push`
* Push the accumulated commits to your fork/branch in GitHub: `git push`

* Open GitHub and issue a pull request.

* **IMPORTANT** Keep your code updated with the upstream. with the following commands.
* **IMPORTANT** Keep your master branch code up-to-date with the upstream repository using the following commands. As commits from other developers accumulate in the master, merge these into your fork prior to issuing a pull request.

```
git remote add upstream https://github.com/NOAA-OWP/t-route.git
git fetch upstream && git merge --rebase upstream/master
git fetch upstream && git pull --rebase upstream master
```

## A more detailed step-by-step guide to contributing via GitHub

### 1. On GitHub, create a fork and clone it to your local directory
Expand Down

0 comments on commit 011b4d7

Please sign in to comment.