Skip to content

Commit f6e2cb1

Browse files
proof reading: intro to version control workshop info
1 parent 9202b24 commit f6e2cb1

File tree

1 file changed

+8
-18
lines changed

1 file changed

+8
-18
lines changed

programme_information/intro_to_version_control.ipynb

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@
2727
"- Have the confidence to learn more advanced features of Git and GitHub as required for their work, such as working with branches and pull requests.\n",
2828
"\n",
2929
"\n",
30-
"## Pre-requisite Knowledge\n",
30+
"## Pre-requisites\n",
3131
"\n",
32-
"A willingness to work with Git and GitHub in a hands-on way throughout the sessions.\n",
32+
"Familiarity of working at a Unix command line (e.g. Apple Terminal, a terminal running Bash) is helpful but not essential. A good introduction to this topic more generally can be found at the sister course - *Introduction to Unix*.\n",
3333
"\n",
34-
"Basic familiarity of working at a Unix command line (e.g. Apple Terminal, a terminal running Bash) is helpful but not essential. We have included a cheat sheet on basic commands that will be useful for this course on the resources page. A good introduction to this topic more generally can be found at the sister course Introduction to Unix Shell.\n",
35-
"\n",
36-
"Version control systems are primarily used for source code development, so experience writing some code (e.g. R, Python, LaTeX, bash scripts, C,…) is helpful though not essential.\n",
34+
"Version control systems are primarily used for source code development, so experience writing some code (e.g. R, Python, LaTeX, bash scripts, C,…) is helpful, though not essential.\n",
3735
"\n",
3836
"\n",
3937
"## Installation Guide \n",
4038
"\n",
39+
"All CfRR courses require attendees to use their own computer/laptop to follow workshop activities and take effective notes. \n",
40+
"\n",
4141
"\n",
4242
"In order to fully participate in this course, you should make sure you\n",
4343
"have the following in place **before** the first workshop, with each step described below.\n",
@@ -57,12 +57,6 @@
5757
"administrative privileges. If you need support due to not having these\n",
5858
"privileges on your computer then please contact the University's IT department._\n",
5959
"\n",
60-
"For those struggling to install the required software or sign up to GitHub,\n",
61-
"there will be an opportunity to get support from the course organisers in drop-in\n",
62-
"sessions shortly before the start of the course. The time available in these\n",
63-
"sessions is limited, so please only attend if you have already tried following the\n",
64-
"instructions below.\n",
65-
"\n",
6660
"\n",
6761
"### Installing Git\n",
6862
"\n",
@@ -89,7 +83,7 @@
8983
"\n",
9084
" then Git is not installed.\n",
9185
"\n",
92-
"If you don't have Git installed then you will need install it. Instructions and\n",
86+
"If you don't have Git installed then you will need to install it. Instructions and\n",
9387
"recommended sources for doing this are provided below, according to operating\n",
9488
"systems.\n",
9589
"\n",
@@ -182,19 +176,15 @@
182176
"\n",
183177
"This course has been adapted from Software Carpentry's\n",
184178
"<a href=\"https://swcarpentry.github.io/git-novice/\" target=\"_blank\" rel=\"external noreferrer\">Version Control with Git</a>\n",
185-
"course [[^1]] (retrieved from <a href=\"https://swcarpentry.github.io/git-novice/\" target=\"_blank\" rel=\"external noreferrer\">https://swcarpentry.github.io/git-novice/</a>\n",
179+
"course [1] (retrieved from <a href=\"https://swcarpentry.github.io/git-novice/\" target=\"_blank\" rel=\"external noreferrer\">https://swcarpentry.github.io/git-novice/</a>\n",
186180
"and <a href=\"http://erdavenport.github.io/git-lessons/10-branching.html\" target=\"_blank\" rel=\"external noreferrer\">http://erdavenport.github.io/git-lessons/10-branching.html</a>), which is &copy; <a href=\"https://software-carpentry.org/\" target=\"_blank\" rel=\"external noreferrer\">Software Carpentry</a> and licensed\n",
187181
"under <a href=\"https://creativecommons.org/licenses/by/4.0/\" target=\"_blank\" rel=\"external noreferrer\">Creative Commons BY 4.0</a>.\n",
188182
"Changes have been made from the original content.\n",
189183
"\n",
190184
"\n",
191185
"### References\n",
192186
"\n",
193-
"[^1]: Ivan Gonzalez; Daisie Huang; Nima Hejazi; Katherine Koziar; \n",
194-
" Madicken Munk (eds): \"Software Carpentry: Version Control with Git.\" \n",
195-
" Version 2019.06.1, July 2019,\n",
196-
" <a href=\"https://github.com/swcarpentry/git-novice\">https://github.com/swcarpentry/git-novice</a>,\n",
197-
" 10.5281/zenodo.3264950\n",
187+
"[1] Ivan Gonzalez; Daisie Huang; Nima Hejazi; Katherine Koziar; Madicken Munk (eds): \"Software Carpentry: Version Control with Git.\" Version 2019.06.1, July 2019, <a href=\"https://github.com/swcarpentry/git-novice\">https://github.com/swcarpentry/git-novice</a>, 10.5281/zenodo.3264950\n",
198188
" \n",
199189
"## Developers\n",
200190
"\n",

0 commit comments

Comments
 (0)