Skip to content

Commit

Permalink
Merge pull request #156 from wgs4/dev
Browse files Browse the repository at this point in the history
update to "My First PR" with screenshot
  • Loading branch information
danamlewis committed May 9, 2016
2 parents 27b8cb1 + 283a472 commit db08aa8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
Binary file added docs/docs/Images/Pull Request.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions docs/docs/Resources/my-first-pr.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,11 @@ OK, let's get started. For our example we are going to make an edit to the opena
We now have an improved file that we want to be pulled back into the dev repository at https://github.com/openaps/docs

1. Go to https://github.com/openaps/docs
2. Select dev from the branch drop down on the upper left (since that's where we'd like the changes to go to)
3. Press the pull request button
2. Click the green "New pull request" button
3. Under the Compare Changes heading, click "compare across forks"
4. Set up the the branches you are targeting. The easiest way of thinking about the branch range is this: the base branch is where you think changes should be applied, the head branch is what you would like to be applied.
5. So choose so the base fork as openaps/docs and then the base as dev. The head fork is going to be <youraccount>/docs and the base as dev.
5. So, choose the base fork as openaps/docs and then the base as dev. The head fork is going to be <i>youraccount</i>/docs and the base as dev.
<img src="/docs/docs/Images/Pull Request.png"/>
6. It should show the list of changes you made. If not, you did something wrong so stop here and ask for help. If the list looks like your changes then put a note in there to what the overarching reason for the changes are (in your case you only made one, but you could have made a bunch). Create the PR.

It will now be in a list of PR's that the team will review and potentially give feedback on before committing to the main documentation for openaps!
Expand Down

0 comments on commit db08aa8

Please sign in to comment.