Skip to content

Commit

Permalink
Fix markdown formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
jhart-r7 committed Jun 9, 2015
1 parent 20eddea commit 1807da6
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,24 +84,23 @@ In short:

1. Follow the "Fork and Clone" steps from above
2. Update your `.git/config` to ensure that the `remote ["upstream"]` section is configure to pull both branches and PRs from upstream. It should look something like the following, in particular the second `fetch` option:
```
[remote "upstream"]
url = git@github.com:rapid7/recog.git
fetch = +refs/heads/*:refs/remotes/upstream/*
fetch = +refs/pull/*/head:refs/remotes/upstream/pr/*
```

```
[remote "upstream"]
url = git@github.com:rapid7/recog.git
fetch = +refs/heads/*:refs/remotes/upstream/*
fetch = +refs/pull/*/head:refs/remotes/upstream/pr/*
```
3. Fetch the latest revisions, including PRs:

```
git fetch --all
```

4. Checkout and branch the PR for testing. Replace ```PR``` below with the actual PR # in question:

```
git checkout -b landing-PR upstream/pr/PR
```

5. Test the PR, which typically involves running ```rspec```.
6. Merge with master, re-test, validate and push:

Expand Down

0 comments on commit 1807da6

Please sign in to comment.