|
45 | 45 | and to meet some of our community members. |
46 | 46 |
|
47 | 47 | 1. If you do not have a [GitHub][github] account, |
48 | | - you can [send us comments by email][contact]. |
| 48 | + you can [send us comments by email][email]. |
49 | 49 | However, |
50 | 50 | we will be able to respond more quickly if you use one of the other methods described below. |
51 | 51 |
|
|
126 | 126 | and create your own revision-specific branch(es) from there. |
127 | 127 | Please only work on your newly-created branch(es) and *not* |
128 | 128 | your clone of the master `gh-pages` branch. |
129 | | -To manage changes, we follow [GitHub flow][github-flow]. In brief: |
130 | | -
|
131 | | -1. Fork the repository to your GitHub profile and create a clone on your desktop. |
132 | | -2. Create a new branch in your desktop copy of this repository for each significant |
133 | | -change being made. |
134 | | -3. Make revisions as required. |
135 | | -4. Stage all changed files and commit them within the appropriate branch. |
136 | | -5. Push any new branches to your forked copy of this repository on GitHub. |
137 | | -6. Submit a pull request from that branch to the master repository. |
138 | | -7. If you receive feedback, make changes using your desktop copy of the repository and |
139 | | -push to your branch on GitHub. The pull request will update automatically. |
140 | | -8. Repeat as needed. |
| 129 | +To manage changes, we follow [GitHub flow][github-flow]. Using the web interface: |
| 130 | +
|
| 131 | +1. Fork the master repository to your GitHub profile. |
| 132 | +2. Within your version of the forked repository, move to the `gh-pages` branch and |
| 133 | +create a new branch for each significant change being made. |
| 134 | +3. Navigate to the file(s) you wish to change within the new branches and make revisions as required. |
| 135 | +4. Commit all changed files within the appropriate branches. |
| 136 | +5. Create individual pull requests from each of your changed branches |
| 137 | +to the `gh-pages` branch within the master repository. |
| 138 | +6. If you receive feedback, make changes using your issue-specific branches of the forked |
| 139 | +repository and the pull requests will update automatically. |
| 140 | +7. Repeat as needed until all feedback has been addressed. |
141 | 141 |
|
142 | 142 | Each lesson has two maintainers who review issues and pull requests or encourage others to do so. |
143 | 143 | The maintainers are community volunteers and have final say over what gets merged into the lesson. |
|
147 | 147 | General discussion of [Software Carpentry][swc-site] and [Data Carpentry][dc-site] |
148 | 148 | happens on the [discussion mailing list][discuss-list], |
149 | 149 | which everyone is welcome to join. |
150 | | -You can also [reach us by email][contact]. |
| 150 | +You can also [reach us by email][email]. |
151 | 151 |
|
152 | | -[contact]: mailto:[email protected] |
| 152 | + |
153 | 153 | [dc-issues]: https://github.com/issues?q=user%3Adatacarpentry |
154 | 154 | [dc-lessons]: http://datacarpentry.org/lessons/ |
155 | 155 | [dc-site]: http://datacarpentry.org/ |
|
0 commit comments