You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
@@ -143,11 +143,11 @@ control over your digital research artifacts and notes
143
143
## Third-party services
144
144
145
145
As you learned in the [Remotes in GitHub](http://swcarpentry.github.io/git-novice/07-github/) section of the [Software Carpentry Git course](http://swcarpentry.github.io/git-novice/), the [GitHub] website provides you with public (or private) storage for your Git repositories on the web.
146
-
The GitHub website also allows third-party websites to interact with your repositories
146
+
The GitHub website also allows third-party websites to interact with your repositories
147
147
to provide additional services, typically in response to new changes
148
148
to your repositories. Visit [GitHub Marketplace](https://github.com/marketplace) for an
149
149
overview of the vast collection of such additional services. Some services are free,
150
-
some are "pay-for-service". Students can benefit from obtaining a
150
+
some are "pay-for-service". Students can benefit from obtaining a
151
151
[Student Developer Pack](https://education.github.com/pack) to gain free access to
152
152
some services which otherwise would require a fee.
153
153
@@ -167,25 +167,25 @@ For example, see [simple workflow](https://github.com/ReproNim/simple_workflow)
167
167
with [GitHub], and is free for publicly available projects.
168
168
169
169
> ## External teaching materials
170
-
> - [A quick Travis CI Tutorial for Node.js developers (full: 20m)](https://github.com/dwyl/learn-travis) --
170
+
> - [A quick Travis CI Tutorial for Node.js developers (full: 20m)](https://github.com/dwyl/learn-travis) --
171
171
> a good description of all necessary steps to enable Travis CI for your GitHub project;
172
172
> although geared toward Node.js projects, the same principles apply to other platforms/languages.
173
-
> - [Shablona - A template for small scientific python projects (review: 5m, optional)](https://github.com/uwescience/shablona) --
173
+
> - [Shablona - A template for small scientific python projects (review: 5m, optional)](https://github.com/uwescience/shablona) --
174
174
> a template for scientific Python projects; review its `.travis.yml` for an example
175
175
> of a typical setup for a Python-based project.
176
-
> - [Travis CI Documentation (familiarize: 10m, canonical reference)](https://docs.travis-ci.com/) --
176
+
> - [Travis CI Documentation (familiarize: 10m, canonical reference)](https://docs.travis-ci.com/) --
177
177
> documentation for Travis CI; review sections relevant to your language/platform.
> documentation for CircleCI; review sections relevant to your language/platform.
185
185
{: .callout}
186
186
187
187
> ## External review materials
188
-
> - [Continuous Integration in the Cloud: Comparing Travis, Circle and Codeship (review: 10m)](https://strongloop.com/strongblog/node-js-travis-circle-codeship-compare/) --
188
+
> - [Continuous Integration in the Cloud: Comparing Travis, Circle and Codeship (review: 10m)](https://strongloop.com/strongblog/node-js-travis-circle-codeship-compare/) --
189
189
> having acquainted yourself with the basics of two CIs, review the differences.
190
190
> - [Side-by-side comparison of CI services: review 5m](https://www.slant.co/versus/625/2481/~circleci_vs_appveyor)
191
191
{: .callout}
@@ -204,21 +204,21 @@ with [GitHub], and is free for publicly available projects.
204
204
without committing the (large) content of those files directly under git.
205
205
In a nutshell, [git-annex]
206
206
207
-
- moves actual data file(s) under `.git/annex/objects` into a file typically
208
-
named according to the [checksum](https://en.wikipedia.org/wiki/Checksum) of
207
+
- moves actual data file(s) under `.git/annex/objects` into a file typically
208
+
named according to the [checksum](https://en.wikipedia.org/wiki/Checksum) of
209
209
the file's content, and in its place creates a [symbolic link](https://en.wikipedia.org/wiki/Symbolic_link) (symlink) pointing to that new location
210
210
- commits that symlink (not actual data) under git, so a file of any size
211
211
has the same small footprint within git
212
212
- within `git-annex` branch, the location of the data file (on which machine, clone, or
213
213
web URL) is recorded
214
-
214
+
215
215
Later on, if you have access to the clones of the repository containing
216
216
the file, you can easily `get` it (which will download/copy that file
217
-
under `.git/annex/objects`) or `drop` it (which will remove that file from
217
+
under `.git/annex/objects`) or `drop` it (which will remove that file from
218
218
`.git/annex/objects`).
219
219
220
-
Since Git doesn't contain the actual content of large files, but
221
-
instead just contains symlinks and information in the `git-annex` branch, it
220
+
Since Git doesn't contain the actual content of large files, but
221
+
instead just contains symlinks and information in the `git-annex` branch, it
222
222
becomes possible to
223
223
224
224
- have very lean Git repositories pointing to arbitrarily large files
@@ -230,16 +230,16 @@ becomes possible to
230
230
### Note
231
231
232
232
Never manually `git merge` a `git-annex` branch; [git-annex] uses a special merge
233
-
algorithm to merge data availability information, and you should use
0 commit comments