Skip to content

Commit 6a3c67b

Browse files
stijnvanhoeystijnvanhoey
authored
Merge pull request #20 from inbo/git
Git and Github course material and additional manuals
2 parents 87b3cf4 + 5d84870 commit 6a3c67b

209 files changed

Lines changed: 26217 additions & 29 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
# Ignore tokens
1212
*.rds
1313
.httr-oauth
14+
token
1415

1516
# ignore temporary download files
1617
2016-04-20-processed-logs*

‎docs/data-handling-database-R.html‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,30 @@
246246
<a href="data-handling-database-R.html">Read data from INBO databases (SQL Server) from R</a>
247247
</li>
248248
</ul>
249+
</li>
250+
<li class="dropdown">
251+
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
252+
Git tutorials
253+
254+
<span class="caret"></span>
255+
</a>
256+
<ul class="dropdown-menu" role="menu">
257+
<li>
258+
<a href="manual-git.html">Git hands-on session</a>
259+
</li>
260+
<li>
261+
<a href="manual-git-workflow.html">Git collaborative workflow for command line</a>
262+
</li>
263+
<li>
264+
<a href="manual-git-fix-conflict.html">Fix merge conflict with a pull request</a>
265+
</li>
266+
<li>
267+
<a href="manual-git-undo-commits.html">Undo commits with command line</a>
268+
</li>
269+
<li>
270+
<a href="manual-git-without-internet.html">Git without internet connection</a>
271+
</li>
272+
</ul>
249273
</li>
250274
</ul>
251275
<ul class="nav navbar-nav navbar-right">

‎docs/data-handling-googlesheet-R.html‎

Lines changed: 36 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,30 @@
246246
<a href="data-handling-database-R.html">Read data from INBO databases (SQL Server) from R</a>
247247
</li>
248248
</ul>
249+
</li>
250+
<li class="dropdown">
251+
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
252+
Git tutorials
253+
254+
<span class="caret"></span>
255+
</a>
256+
<ul class="dropdown-menu" role="menu">
257+
<li>
258+
<a href="manual-git.html">Git hands-on session</a>
259+
</li>
260+
<li>
261+
<a href="manual-git-workflow.html">Git collaborative workflow for command line</a>
262+
</li>
263+
<li>
264+
<a href="manual-git-fix-conflict.html">Fix merge conflict with a pull request</a>
265+
</li>
266+
<li>
267+
<a href="manual-git-undo-commits.html">Undo commits with command line</a>
268+
</li>
269+
<li>
270+
<a href="manual-git-without-internet.html">Git without internet connection</a>
271+
</li>
272+
</ul>
249273
</li>
250274
</ul>
251275
<ul class="nav navbar-nav navbar-right">
@@ -284,20 +308,20 @@ <h2>Setup</h2>
284308
<p>Make sure the token is savely stored within your project folder without sharing it or putting it into the version control history. If you need more power (e.g. necessity of integration services such as Travis CI), check the encryption options in <a href="https://rawgit.com/jennybc/googlesheets/master/vignettes/managing-auth-tokens.html">this manual</a>.</p>
285309
<p>Once registered, an overview of your available google sheets is provided as follows:</p>
286310
<pre class="r"><code>gs_ls()</code></pre>
287-
<pre><code>## # A tibble: 167 × 10
311+
<pre><code>## # A tibble: 188 × 10
288312
## sheet_title author perm version
289313
## &lt;chr&gt; &lt;chr&gt; &lt;chr&gt; &lt;chr&gt;
290-
## 1 overzicht netwerken en … tessa.vansan… rw old
291-
## 2 LifeWatch budget en uit… peter.desmet… rw old
292-
## 3 Open biodiversity data … peter.desmet rw old
293-
## 4 400+ Tools and innovati… jeroensbox rw old
294-
## 5 Smartphone_uitrol inbodata rw old
295-
## 6 DQ Tests-Assertions - P… godfoder rw old
296-
## 7 IDC-budget 2017 daniel.duseu… rw old
297-
## 8 LifeWatch Monthly Activ… info55896 rw old
298-
## 9 Bird tracking devices peter.desmet rw old
299-
## 10 2015.05.01 Contactgegev… thomas.timme… rw old
300-
## # ... with 157 more rows, and 6 more variables: updated &lt;dttm&gt;,
314+
## 1 overzicht SVZ migratie … joost.sturte… rw old
315+
## 2 Opleiding Git(hub) stijn.vanhoey rw old
316+
## 3 Opleiding scripting maarten.stev… rw old
317+
## 4 INBO A1 publications 20… peter.desmet rw old
318+
## 5 400+ Tools and innovati… jeroensbox rw old
319+
## 6 T0 sources datasets sander.devis… rw old
320+
## 7 INBO en lopen gerald.louet… rw old
321+
## 8 Statistics peter.desmet rw old
322+
## 9 LifeWatch budget en uit… peter.desmet… rw old
323+
## 10 vergelijking fotodataba… tanja.milotic rw old
324+
## # ... with 178 more rows, and 6 more variables: updated &lt;dttm&gt;,
301325
## # sheet_key &lt;chr&gt;, ws_feed &lt;chr&gt;, alternate &lt;chr&gt;, self &lt;chr&gt;,
302326
## # alt_key &lt;chr&gt;</code></pre>
303327
</div>
@@ -318,23 +342,6 @@ <h2>I just want to load a google spreadsheet</h2>
318342
<pre class="r"><code>breedingbirds &lt;- redlists %&gt;%
319343
gs_read(ws = &quot;BreedingBirds&quot;)</code></pre>
320344
<pre><code>## Accessing worksheet titled &#39;BreedingBirds&#39;.</code></pre>
321-
<pre><code>##
322-
Downloading: 1.3 kB
323-
Downloading: 1.3 kB
324-
Downloading: 2.2 kB
325-
Downloading: 2.2 kB
326-
Downloading: 3 kB
327-
Downloading: 3 kB
328-
Downloading: 4.1 kB
329-
Downloading: 4.1 kB
330-
Downloading: 4.6 kB
331-
Downloading: 4.6 kB
332-
Downloading: 5.6 kB
333-
Downloading: 5.6 kB
334-
Downloading: 5.6 kB
335-
Downloading: 5.6 kB
336-
Downloading: 5.6 kB
337-
Downloading: 5.6 kB</code></pre>
338345
<pre><code>## No encoding supplied: defaulting to UTF-8.</code></pre>
339346
<p>Inspecting the data of the sheet:</p>
340347
<pre class="r"><code>class(breedingbirds)</code></pre>

‎docs/data-handling-large-files-R.html‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,30 @@
248248
<a href="data-handling-database-R.html">Read data from INBO databases (SQL Server) from R</a>
249249
</li>
250250
</ul>
251+
</li>
252+
<li class="dropdown">
253+
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
254+
Git tutorials
255+
256+
<span class="caret"></span>
257+
</a>
258+
<ul class="dropdown-menu" role="menu">
259+
<li>
260+
<a href="manual-git.html">Git hands-on session</a>
261+
</li>
262+
<li>
263+
<a href="manual-git-workflow.html">Git collaborative workflow for command line</a>
264+
</li>
265+
<li>
266+
<a href="manual-git-fix-conflict.html">Fix merge conflict with a pull request</a>
267+
</li>
268+
<li>
269+
<a href="manual-git-undo-commits.html">Undo commits with command line</a>
270+
</li>
271+
<li>
272+
<a href="manual-git-without-internet.html">Git without internet connection</a>
273+
</li>
274+
</ul>
251275
</li>
252276
</ul>
253277
<ul class="nav navbar-nav navbar-right">
@@ -588,6 +612,7 @@ <h3>Create a SQLite databases from a CSV file</h3>
588612
csv_to_sqlite(paste(&quot;./data-handling-large-files-R&quot;, csv.name, sep = &quot;/&quot;),
589613
sqlite_file, table_name, pre_process_size = 1000,
590614
chunk_size = 50000)</code></pre>
615+
<pre><code>## [1] TRUE</code></pre>
591616
<p>Hence, this approach will work for large files as well and is an ideal first step when doing this kind of analysis. Once performed, the SQlite database is available to query, similar to the previous examples:</p>
592617
<pre class="r"><code>my_db &lt;- src_sqlite(&quot;example2.sqlite&quot;, create = FALSE)
593618
bird_tracking &lt;- tbl(my_db, &quot;birdtracks&quot;)

‎docs/development-styleguide-R.html‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,30 @@
246246
<a href="data-handling-database-R.html">Read data from INBO databases (SQL Server) from R</a>
247247
</li>
248248
</ul>
249+
</li>
250+
<li class="dropdown">
251+
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
252+
Git tutorials
253+
254+
<span class="caret"></span>
255+
</a>
256+
<ul class="dropdown-menu" role="menu">
257+
<li>
258+
<a href="manual-git.html">Git hands-on session</a>
259+
</li>
260+
<li>
261+
<a href="manual-git-workflow.html">Git collaborative workflow for command line</a>
262+
</li>
263+
<li>
264+
<a href="manual-git-fix-conflict.html">Fix merge conflict with a pull request</a>
265+
</li>
266+
<li>
267+
<a href="manual-git-undo-commits.html">Undo commits with command line</a>
268+
</li>
269+
<li>
270+
<a href="manual-git-without-internet.html">Git without internet connection</a>
271+
</li>
272+
</ul>
249273
</li>
250274
</ul>
251275
<ul class="nav navbar-nav navbar-right">

‎docs/development-styleguide-repos.html‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,30 @@
246246
<a href="data-handling-database-R.html">Read data from INBO databases (SQL Server) from R</a>
247247
</li>
248248
</ul>
249+
</li>
250+
<li class="dropdown">
251+
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
252+
Git tutorials
253+
254+
<span class="caret"></span>
255+
</a>
256+
<ul class="dropdown-menu" role="menu">
257+
<li>
258+
<a href="manual-git.html">Git hands-on session</a>
259+
</li>
260+
<li>
261+
<a href="manual-git-workflow.html">Git collaborative workflow for command line</a>
262+
</li>
263+
<li>
264+
<a href="manual-git-fix-conflict.html">Fix merge conflict with a pull request</a>
265+
</li>
266+
<li>
267+
<a href="manual-git-undo-commits.html">Undo commits with command line</a>
268+
</li>
269+
<li>
270+
<a href="manual-git-without-internet.html">Git without internet connection</a>
271+
</li>
272+
</ul>
249273
</li>
250274
</ul>
251275
<ul class="nav navbar-nav navbar-right">

‎docs/index.html‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,30 @@
246246
<a href="data-handling-database-R.html">Read data from INBO databases (SQL Server) from R</a>
247247
</li>
248248
</ul>
249+
</li>
250+
<li class="dropdown">
251+
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
252+
Git tutorials
253+
254+
<span class="caret"></span>
255+
</a>
256+
<ul class="dropdown-menu" role="menu">
257+
<li>
258+
<a href="manual-git.html">Git hands-on session</a>
259+
</li>
260+
<li>
261+
<a href="manual-git-workflow.html">Git collaborative workflow for command line</a>
262+
</li>
263+
<li>
264+
<a href="manual-git-fix-conflict.html">Fix merge conflict with a pull request</a>
265+
</li>
266+
<li>
267+
<a href="manual-git-undo-commits.html">Undo commits with command line</a>
268+
</li>
269+
<li>
270+
<a href="manual-git-without-internet.html">Git without internet connection</a>
271+
</li>
272+
</ul>
249273
</li>
250274
</ul>
251275
<ul class="nav navbar-nav navbar-right">

‎docs/installation-R-admin.html‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,30 @@
246246
<a href="data-handling-database-R.html">Read data from INBO databases (SQL Server) from R</a>
247247
</li>
248248
</ul>
249+
</li>
250+
<li class="dropdown">
251+
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
252+
Git tutorials
253+
254+
<span class="caret"></span>
255+
</a>
256+
<ul class="dropdown-menu" role="menu">
257+
<li>
258+
<a href="manual-git.html">Git hands-on session</a>
259+
</li>
260+
<li>
261+
<a href="manual-git-workflow.html">Git collaborative workflow for command line</a>
262+
</li>
263+
<li>
264+
<a href="manual-git-fix-conflict.html">Fix merge conflict with a pull request</a>
265+
</li>
266+
<li>
267+
<a href="manual-git-undo-commits.html">Undo commits with command line</a>
268+
</li>
269+
<li>
270+
<a href="manual-git-without-internet.html">Git without internet connection</a>
271+
</li>
272+
</ul>
249273
</li>
250274
</ul>
251275
<ul class="nav navbar-nav navbar-right">

‎docs/installation-R-user.html‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,30 @@
246246
<a href="data-handling-database-R.html">Read data from INBO databases (SQL Server) from R</a>
247247
</li>
248248
</ul>
249+
</li>
250+
<li class="dropdown">
251+
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
252+
Git tutorials
253+
254+
<span class="caret"></span>
255+
</a>
256+
<ul class="dropdown-menu" role="menu">
257+
<li>
258+
<a href="manual-git.html">Git hands-on session</a>
259+
</li>
260+
<li>
261+
<a href="manual-git-workflow.html">Git collaborative workflow for command line</a>
262+
</li>
263+
<li>
264+
<a href="manual-git-fix-conflict.html">Fix merge conflict with a pull request</a>
265+
</li>
266+
<li>
267+
<a href="manual-git-undo-commits.html">Undo commits with command line</a>
268+
</li>
269+
<li>
270+
<a href="manual-git-without-internet.html">Git without internet connection</a>
271+
</li>
272+
</ul>
249273
</li>
250274
</ul>
251275
<ul class="nav navbar-nav navbar-right">

‎docs/installation-RStudio-admin.html‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,30 @@
246246
<a href="data-handling-database-R.html">Read data from INBO databases (SQL Server) from R</a>
247247
</li>
248248
</ul>
249+
</li>
250+
<li class="dropdown">
251+
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
252+
Git tutorials
253+
254+
<span class="caret"></span>
255+
</a>
256+
<ul class="dropdown-menu" role="menu">
257+
<li>
258+
<a href="manual-git.html">Git hands-on session</a>
259+
</li>
260+
<li>
261+
<a href="manual-git-workflow.html">Git collaborative workflow for command line</a>
262+
</li>
263+
<li>
264+
<a href="manual-git-fix-conflict.html">Fix merge conflict with a pull request</a>
265+
</li>
266+
<li>
267+
<a href="manual-git-undo-commits.html">Undo commits with command line</a>
268+
</li>
269+
<li>
270+
<a href="manual-git-without-internet.html">Git without internet connection</a>
271+
</li>
272+
</ul>
249273
</li>
250274
</ul>
251275
<ul class="nav navbar-nav navbar-right">

0 commit comments

Comments
 (0)