Progress

Dependencies

• [2] BZTIJPUB Finish the predictions
• [3] QEKU5M3O Preface
• [4] PMBAMPBI Finish the title slide
• [5] UYGSVBN7 Start the fossil demo
• [6] ARAFRHKU Create the outline of the talk
• [7] WYULWETJ Reorganize
• [8] 4AZS4L6B Add chapters
• [9] S55XICBM Fix speaker notes
• [10] SQWPGFUE Finish the demos
• [11] 36IPNPIS Handle a few TODOs
• [12] 5LKTNB6O LOTS of progress
• [13] KPHR32IR Progress
• [14] LDVTVP2G All TODOs are gone now
• [15] NYFLNSVV Add some contents
• [16] CBUCBYTV Progress
• [*] UH3YXOLF Start the slide deck

Change contents

• replacement in index.html at line 105
  [3.330244]→[3.37207:37253](∅→∅)
  − <strong>Time Elapsed: 54 min.</strong>
  [3.330244]

  [2.1]
  + <strong>Time Elapsed: 45 min.</strong>
• file addition: Will Git Be Around Forever A List of Possible Successors.pdf (----------)
  [3.2001020]
• replacement in sections/0-welcome.md at line 25
  [3.37422]→[2.144:168](∅→∅)
  − * Test Extend -> Mirror
  [3.37422]

  [2.168]
  + * Test Extend -> Mirror (not needed if there is a screen on the stage)
• replacement in sections/2-git.md at line 8
  [3.7969587]→[3.41575:41601](∅→∅)
  − **Time Elapsed:** 10 min.
  [3.7969587]

  [3.4222622]
  + **Time Elapsed:** 7 min.
• replacement in sections/3-the-browser-wars.md at line 8
  [3.4173]→[3.49302:49328](∅→∅)
  − **Time Elapsed:** 17 min.
  [3.4173]

  [3.4199]
  + **Time Elapsed:** 16 min.
• replacement in sections/4-four-new-kids-on-the-block.md at line 8
  [3.4234494]→[3.51476:51502](∅→∅)
  − **Time Elapsed:** 22 min.
  [3.4234494]

  [3.2744700]
  + **Time Elapsed:** 20 min.
• replacement in sections/5-fossil.md at line 8
  [3.2041108]→[3.52798:52824](∅→∅)
  − **Time Elapsed:** 26 min.
  [3.2041108]

  [3.52824]
  + **Time Elapsed:** 24 min.
• replacement in sections/5-fossil.md at line 120
  [3.872]→[3.872:988](∅→∅)
  − <https://www.omiyagames.com/blog/2014/02/15/farewell-fossil-version-control> <!-- .element: class="attribution" -->
  [3.872]

  [3.7973256]
  + <https://www.omiyagames.com/blog/2014/02/15/farewell-fossil-version-control>
• replacement in sections/6-pijul.md at line 8
  [3.2041064]→[3.53775:53801](∅→∅)
  − **Time Elapsed:** 34 min.
  [3.2041064]

  [3.7972461]
  + **Time Elapsed:** 33 min.
• edit in sections/6-pijul.md at line 71
  [3.1517]→[3.1517:1528](∅→∅),[3.1308]→[3.4236358:4236380](∅→∅),[3.4236358]→[3.4236358:4236380](∅→∅)
  − * Branches

  − * Resolving Conflicts
• edit in sections/6-pijul.md at line 106
  [3.2140]→[3.2140:2231](∅→∅)
  −

  − ### Handling conflicts

  −

  − pijul fork use-math-random

  − pijul checkout use-math-random
• edit in sections/6-pijul.md at line 114
  [3.2358]→[3.2358:2453](∅→∅)
  − pijul checkout master

  − pijul fork use-random-class

  − pijul checkout use-random-class

  −
• edit in sections/6-pijul.md at line 121
  [3.1593]→[3.2588:2689](∅→∅),[3.2689]→[3.4236709:4236710](∅→∅),[3.4236709]→[3.4236709:4236710](∅→∅)
  − pijul checkout use-math-random

  − pijul apply [hash]

  − pijul add Sample.java

  − pijul record

  −
• replacement in sections/7-predictions.md at line 8
  [3.2041143]→[3.54064:54090](∅→∅)
  − **Time Elapsed:** 44 min.
  [3.2041143]

  [3.54090]
  + **Time Elapsed:** 40 min.