-
Notifications
You must be signed in to change notification settings - Fork 198
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
7 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 = [email protected]:rapid7/recog.git | ||
fetch = +refs/heads/*:refs/remotes/upstream/* | ||
fetch = +refs/pull/*/head:refs/remotes/upstream/pr/* | ||
``` | ||
|
||
``` | ||
[remote "upstream"] | ||
url = [email protected]: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: | ||
|