Add wrap-up

[?]

Sep 29, 2022, 7:10 PM

OTJ2YJS2CSLMNUZNAT2FUWHECPRAVEXZ3BXEHWTWCKEQZ247DZNAC

Dependencies

[2] V6J6DSNM Add target timings in speaker notes
[3] SAYGZU3I Add the Pijul section of the Successors talk
[4] IEJDYQSW Initial commit
[5] P3PI25SN Add a few sections
[6] 5FJPILYN Finish first section

Change contents

file addition: snapshot-vs-patch.png (----------)

[3.4883]
edit in index.html at line 44

[3.463]→[3.463:644](∅→∅)

data-separator-vertical="^\r?\n---\r?\n$">
</section>

<section data-markdown="sections/4-comparison.md" data-separator="^\r?\n------\r?\n$"
file deletion: 4-comparison.md (----------)

[3.163536244]→[3.1010:1049](∅→∅),[3.1049]→[3.996:996](∅→∅)



# Comparison

* Tabel die features met Git vergelijken

note:
**Time Elapsed:** 14 min.
replacement in sections/1-dang-it-git-and-welcome.md at line 36

[3.1720]→[3.1720:1753](∅→∅)

There's a lot to like about Git:

[3.1720]

[3.1753]

Well, that's understandable!
Because there's a lot to like about Git:
edit in sections/1-dang-it-git-and-welcome.md at line 40

[3.1771]

[3.1771]

* distributed nature (open-source development, work offline)
edit in sections/1-dang-it-git-and-welcome.md at line 42

[3.1778]→[3.1778:1839](∅→∅)

* distributed nature (open-source development, work offline)
replacement in sections/1-dang-it-git-and-welcome.md at line 44

[3.1867]→[3.1867:1881](∅→∅)

Do we like...

[3.1867]

[3.1881]

Do we like... for example...
replacement in sections/1-dang-it-git-and-welcome.md at line 48

[3.1983]→[3.1983:2022](∅→∅)

* running a diff when nothing happens?

[3.1983]

[3.2022]

* running a diff when nothing happens? (`--staged`)
replacement in sections/1-dang-it-git-and-welcome.md at line 50

[3.2060]→[3.2060:2203](∅→∅)

* getting the same conflicts multiple times when dealing with long-lived branches?
* fresh clones because the repo is too messed up to repair?

[3.2060]

[3.2203]

* getting the same conflicts over and over again when we need long-lived branches?
* having to do a fresh clone because the repo is too messed up to repair?
edit in sections/1-dang-it-git-and-welcome.md at line 53

[3.2246]

[3.2246]

Well... not particularly!
edit in sections/1-dang-it-git-and-welcome.md at line 66

[3.2497]→[3.2497:2498](∅→∅)
edit in sections/1-dang-it-git-and-welcome.md at line 81

[3.3024]→[3.3024:3049](∅→∅)

# Teaching a Git course
replacement in sections/1-dang-it-git-and-welcome.md at line 89

[3.3440]→[3.3440:3527](∅→∅)

Sure enough, after 2005-2006, nothing seems to have happened in version control world.

[3.3440]

[3.3527]

Sure enough, after 2005, nothing seems to have happened in version control world.
replacement in sections/1-dang-it-git-and-welcome.md at line 94

[3.3731]→[3.3731:3972](∅→∅)

And because I didn't know the answer to her question, I started researching it and found a few newer version control systems.
They were called Fossil and Pijul.
This talk is about Pijul, and how its approach is different from Git's approach.

[3.3731]

And because I didn't know the answer to her question, I started researching it and found a newer version control systems.
It was called Pijul.
This talk is about Pijul, and how it's different from Git.
replacement in sections/2-introducing-pijul.md at line 23

[3.824]→[3.4035:4072](∅→∅)

So let's address the name first.
...

[3.824]

[3.4072]

So let's address the name of this version control system first.
[explain the name]
replacement in sections/2-introducing-pijul.md at line 47

[3.1560]→[3.1560:1769](∅→∅)

<li class="fragment fade-in-then-semi-out">written in Rust
<li class="fragment fade-in-then-semi-out">bootstrapped since April 2017
<li class="fragment fade-in-then-semi-out">free code hosting at

[3.1560]

[3.1769]

<li>written in Rust
<li>bootstrapped since April 2017
<li>free code hosting at
replacement in sections/2-introducing-pijul.md at line 58

[3.2034]→[3.2034:2080](∅→∅)

Like IntelliJ, they 'eat their own dog food'.

[3.2034]

[3.2080]

So they 'eat their own dog food'.
replacement in sections/2-introducing-pijul.md at line 72

[3.2790]→[3.2790:2919](∅→∅)

<li class="fragment fade-in-then-semi-out">No merges or rebases; applying a patch is like <code>git cherry-pick</code>.</li>

[3.2790]

[3.2919]

<li class="fragment fade-in-then-semi-out">No rebases, and merges are hardly needed; applying a patch is like <code>git cherry-pick</code>.</li>
edit in sections/2-introducing-pijul.md at line 76

[3.2932]

[3.2932]

Let's zoom in on this "patch-oriented design".

[walk through the bullet list]
edit in sections/2-introducing-pijul.md at line 88

[3.3292]

---

## If commits were bank transactions

<table>
<tr>
<th/>
<th>snapshot</th>
<th>patch</th>
</tr>
<tr class="fragment">
<th align="right">initial balance</th>
<td align="right"><code>100</code></td>
<td align="right"><code>+100</code></td>
</tr>
<tr class="fragment">
<th align="right">salary</th>
<td align="right"><code>400</code></td>
<td align="right"><code>+300</code></td>
</tr>
<tr class="fragment">
<th align="right">heating</th>
<td align="right"><code>0</code></td>
<td align="right"><code>-400</code></td>
</tr>
</table>

note:

Snapshots store account balance, patches store deltas.
Which means patch order doesn't matter for the final result.
edit in sections/3-demo.md at line 4

[3.3426]→[3.3426:3427](∅→∅),[3.3427]→[2.8698586:8698620](∅→∅),[2.8698620]→[3.3427:3431](∅→∅),[3.3427]→[3.3427:3431](∅→∅)

note:
**Time Elapsed:** 6 min.

---
edit in sections/3-demo.md at line 5

[3.3432]→[3.3432:3441](∅→∅)

## Demo
edit in sections/3-demo.md at line 10

[3.3506]

[3.3506]

**Time Elapsed:** 6 min.
edit in sections/a-wrap-up.md at line 2

[3.5999]→[3.5999:6009](∅→∅)

# Wrap-up
replacement in sections/a-wrap-up.md at line 3

[3.4213]→[3.4213:4240](∅→∅)

## When To (Not) Use Pijul

[3.4213]

[3.6009]

# Now what?
replacement in sections/a-wrap-up.md at line 5

[3.6010]→[3.4241:4524](∅→∅)

<section>
<h2>Now what?</h2>
<ul>
<li class="fragment">Git's snapshotting might be too technical for the average user. <strong>So try Pijul for a change!</strong></li>
</ul>
<aside class="notes">
<strong>Time Elapsed: 15 min.</strong>

[3.6010]

[2.8698700]

note:
**Time Elapsed:** 14 min.
replacement in sections/a-wrap-up.md at line 8

[2.8698701]→[3.4533:4797](∅→∅),[3.4533]→[3.4533:4797](∅→∅)

1. A lot of students in my "Git for developers" course are managers, test specialists, requirements engineers, Scrum Masters. And they struggle with Git's snapshot-based approach. Perhaps a patch-based approach like Pijul will suit them better.
</section>

[2.8698701]

[2.8698702]

---
replacement in sections/a-wrap-up.md at line 10

[2.8698703]→[2.8698703:8698709](∅→∅)

note:

[2.8698703]

[3.4797]

## When Do I Use Pijul?
replacement in sections/a-wrap-up.md at line 12

[3.4798]→[2.8698710:8698736](∅→∅)

**Time Elapsed:** 15 min.

[3.4798]

[2.8698736]

* For a hobby project, so you can get the feel of it 
* If your team members currently struggle with Git 
* If you spend too much time on rebasing, merging and conflict resolution 
* If you can self-host or use the Pijul Nest 

**Try Pijul for a change!** 

<https://pijul.org/manual/working_with_others.html> 

note:

A lot of students in my "Git for developers" course are managers, test specialists, requirements engineers, Scrum Masters. And they struggle with Git's snapshot-based approach. Perhaps a patch-based approach like Pijul will suit them better.

---