Skip to content

Commit

Permalink
mention version control page
Browse files Browse the repository at this point in the history
  • Loading branch information
aappling-usgs committed Oct 30, 2017
1 parent 17c251b commit fb8bc19
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion inst/doc/collaborate.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ The vignette "Vizlab Example" gives a good overview on the complete process for

## Github

During our collaboration "sprints", we first assume all contributors are not only comfortable with git, but also the specific git-workflow that our team uses. The scope of this vignette is not to give a complete picture of this git workflow. To briefly summarize however, we have a canonical "upstream" repository that each member forks off. Team members are encouraged to create a branch off their fork for each distinct task. When a task is complete, they submit a pull request to the canonical repository. A different team member should review the pull request before merging onto the master branch. We tend to heavily take advantage of Github's Issues and project task management. Ideally, one pull request should correspond to one Issue, and that Issue can be closed with the merged pull request.
During our collaboration "sprints", we first assume all contributors are not only comfortable with git, but also the specific git-workflow that our team uses. Much more detail is available on our [Version Control training page](https://owi.usgs.gov/R/training-curriculum/r-package-dev/git/). To summarize, we have a canonical "upstream" repository that each member forks Team members are encouraged to create a branch off their fork for each distinct task. When a task is complete, they submit a pull request to the canonical repository. A different team member should review the pull request before merging onto the master branch. We tend to heavily take advantage of Github's Issues and project task management. Ideally, one pull request should correspond to one Issue, and that Issue can be closed with the merged pull request.

## Assign a Task

Expand Down
2 changes: 1 addition & 1 deletion inst/doc/collaborate.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h1>Jumping in!</h1>
<p>The vignette “Vizlab Example” gives a good overview on the complete process for initializing and creating a visualization product from <code>vizlab</code>. However, much of the infrastructure set up in this package is to improve the way we can collaborate during the visualization creation.</p>
<div id="github" class="section level2">
<h2>Github</h2>
<p>During our collaboration “sprints”, we first assume all contributors are not only comfortable with git, but also the specific git-workflow that our team uses. The scope of this vignette is not to give a complete picture of this git workflow. To briefly summarize however, we have a canonical “upstream” repository that each member forks off. Team members are encouraged to create a branch off their fork for each distinct task. When a task is complete, they submit a pull request to the canonical repository. A different team member should review the pull request before merging onto the master branch. We tend to heavily take advantage of Github’s Issues and project task management. Ideally, one pull request should correspond to one Issue, and that Issue can be closed with the merged pull request.</p>
<p>During our collaboration “sprints”, we first assume all contributors are not only comfortable with git, but also the specific git-workflow that our team uses. Much more detail is available on our <a href="https://owi.usgs.gov/R/training-curriculum/r-package-dev/git/">Version Control training page</a>. To summarize, we have a canonical “upstream” repository that each member forks Team members are encouraged to create a branch off their fork for each distinct task. When a task is complete, they submit a pull request to the canonical repository. A different team member should review the pull request before merging onto the master branch. We tend to heavily take advantage of Github’s Issues and project task management. Ideally, one pull request should correspond to one Issue, and that Issue can be closed with the merged pull request.</p>
</div>
<div id="assign-a-task" class="section level2">
<h2>Assign a Task</h2>
Expand Down
2 changes: 1 addition & 1 deletion vignettes/collaborate.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ The vignette "Vizlab Example" gives a good overview on the complete process for

## Github

During our collaboration "sprints", we first assume all contributors are not only comfortable with git, but also the specific git-workflow that our team uses. The scope of this vignette is not to give a complete picture of this git workflow. To briefly summarize however, we have a canonical "upstream" repository that each member forks off. Team members are encouraged to create a branch off their fork for each distinct task. When a task is complete, they submit a pull request to the canonical repository. A different team member should review the pull request before merging onto the master branch. We tend to heavily take advantage of Github's Issues and project task management. Ideally, one pull request should correspond to one Issue, and that Issue can be closed with the merged pull request.
During our collaboration "sprints", we first assume all contributors are not only comfortable with git, but also the specific git-workflow that our team uses. Much more detail is available on our [Version Control training page](https://owi.usgs.gov/R/training-curriculum/r-package-dev/git/). To summarize, we have a canonical "upstream" repository that each member forks Team members are encouraged to create a branch off their fork for each distinct task. When a task is complete, they submit a pull request to the canonical repository. A different team member should review the pull request before merging onto the master branch. We tend to heavily take advantage of Github's Issues and project task management. Ideally, one pull request should correspond to one Issue, and that Issue can be closed with the merged pull request.

## Assign a Task

Expand Down

0 comments on commit fb8bc19

Please sign in to comment.