Release 1.2.0 (#44)

* Add content for episode on local branches

* Add episode on remote branches with GitHub

* Add episode on collaborating via feature branches
---------

Co-authored-by: Felicity Guest <[email protected]>
Co-authored-by: Ed Hone <[email protected]>
Co-authored-by: Matt Johns <[email protected]>

LICENCE

@@ -4,10 +4,10 @@ Instructional Material
 The instructional material in this course is copyright © 2023 University of Exeter
 and is made available under the Creative Commons Attribution 4.0 International
 licence (https://creativecommons.org/licenses/by/4.0/). Instructional material
-consists of material that is contained within the _episodes and images folders in
-this repository, with the exception of code snippets and example programs found
-in files within these folders. Such code snippets and example programs are
-considered software for the purposes of this licence. 
+consists of material that is contained within the _episodes, images and downloads
+folders in this repository, with the exception of code snippets and example
+programs found in files within these folders. Such code snippets and example
+programs are considered software for the purposes of this licence. 
 
 
 Software

_episodes/11_undoing_changes.md

@@ -227,12 +227,11 @@ In effect, this will 'rewind' the commit history back to finish at the given
 put all changes since `<commit>` in the working tree, giving us a chance to
 work with the files as they currently are before the reset.
 
-For example, let's create a file `foo.txt` that contains some random
-text:
+For example, let's create an empty file `foo.txt`. We can do this using
+the `touch` command within the root folder of our repository:
 
 ```
-Some foo-ey random text
-
+$ touch foo.txt
 ```
 
 We'll make a commit of this new file and remove it via a reset. First, we make

_episodes/12_ignoring_files.md

@@ -259,6 +259,33 @@ Your branch is ahead of 'origin/main' by 2 commits.
 nothing to commit, working tree clean
 ```
 
+Notice how we still have 2 some commits that have not been pushed to the remote
+repository. We'll tidy up by pushing these commits, so that our local repository
+and remote repository are up-to-date with each other:
+
+```
+$ git push origin
+Username for 'https://github.com': jbloggs9999
+Password for 'https://[email protected]':
+Enumerating objects: 12, done.
+Counting objects: 100% (12/12), done.
+Delta compression using up to 8 threads
+Compressing objects: 100% (7/7), done.
+Writing objects: 100% (8/8), 1.11 KiB | 1.11 MiB/s, done.
+Total 8 (delta 3), reused 0 (delta 0), pack-reused 0
+remote: Resolving deltas: 100% (3/3), completed with 2 local objects.
+To https://github.com/jbloggs9999/git-good-practice.git
+   92b2ac2..42a9a32  main -> main
+```
+
+Finally, let's add a note to include some material about ignoring files in our
+`TODO.txt` file:
+
+```
+Add some material about ignoring files
+
+```
+
 
 ## What kind of files should be ignored?