summaryrefslogtreecommitdiff
diff options
authorMartin Packman <martin@zegami.com>2017-10-26 10:08:41 +0100
committerMartin Packman <martin@zegami.com>2017-10-26 10:08:41 +0100
commitc23c14d91c71c63a24ef1f29b162e40caa9a43d8 (patch)
tree5f47120b262ae99197c8476327ca1c140b8521bf
parente7dd6a23d6d90ebc8580601c48c9fffd689d25e8 (diff)
Morning updates
-rw-r--r--assets/zegami.pngbin0 -> 15135 bytes
-rw-r--r--index.html27
2 files changed, 16 insertions, 11 deletions
diff --git a/assets/zegami.png b/assets/zegami.png
new file mode 100644
index 0000000..08c805c
--- /dev/null
+++ b/assets/zegami.png
Binary files differ
diff --git a/index.html b/index.html
index e145f44..1b07586 100644
--- a/index.html
+++ b/index.html
@@ -41,7 +41,6 @@ questions for the end.</p>
<li>a brief history of vcses</li>
<li>problems with git</li>
<li>why breezy</li>
-<li>bonus: python 3 porting notes</li>
</ul>
</section>
<section>
@@ -112,8 +111,11 @@ questions for the end.</p>
<h2>git is not perfect</h2>
</section>
<section>
-<h3>Git: How to Do Things</h3>
-<p>see <a href="http://www.cs.cornell.edu/~asampson/blog/git.html">Adrian Sampson post</a></p>
+<h3>git is hard to use</h3>
+<p>see <a href="http://www.cs.cornell.edu/~asampson/blog/git.html">Adrian Sampson Git: How to Do Things</a></p>
+<aside class="notes">
+<p>rather than just me complaining, here are some examples</p>
+</aside>
</section>
<section>
<p>revert your changes to a file</p>
@@ -158,14 +160,6 @@ questions for the end.</p>
</aside>
</section>
<section>
-<p>better collaboration</p>
-<aside class="notes">
-<p>Working together still too hard.</p>
-<p>Tied to centralised systems like github still.</p>
-<p>Attempts in Debian around distributed versioned bug tracking.</p>
-</aside>
- </section>
- <section>
<h3>vcses should do so much more</h3>
</section>
<section>
@@ -175,6 +169,13 @@ questions for the end.</p>
</aside>
</section>
<section>
+<p>work for non-software engineering tasks</p>
+<aside class="notes">
+<p>A friend in pharma said they probably should use version control at work,
+but currently just have a really careful naming scheme for files.</p>
+</aside>
+ </section>
+ <section>
<p>better collaboration</p>
<aside class="notes">
<p>Working together still too hard.</p>
@@ -250,6 +251,10 @@ class cmd_ancestor_growth(commands.Command):
<section>
<h3>Thanks! Questions?</h3>
</section>
+ <section>
+<img class="plain" src="assets/zegami.png" />
+<p>we are hiring</p>
+ </section>
</div>
</div>