{"header":{"message":"Add wrap-up","description":null,"timestamp":"2022-09-29T19:10:58Z","authors":[{"email":"hanno.embregts@infosupport.com","name":"Hanno Embregts"}]},"hash":"OTJ2YJS2CSLMNUZNAT2FUWHECPRAVEXZ3BXEHWTWCKEQZ247DZNAC","authors":[],"deps":{"hashes":[["OTJ2YJS2CSLMNUZNAT2FUWHECPRAVEXZ3BXEHWTWCKEQZ247DZNAC","Add wrap-up"],["AA",null],["V6J6DSNMDBJJZQ2XBTRABQLCWBPCUN7ABEQ4NLML26QWGMYMYUYQC","Add target timings in speaker notes"],["IEJDYQSWFL4L73DUWIBDNIPKD4OANRP5K3NDGEDM6FSMIDHKWLBQC","Initial commit"],["P3PI25SNXZTWEGRXTURJKBVUW6KMV7QJ6P5RYT2FILNCLBPCA6AAC","Add a few sections"],["SAYGZU3IYYSTVWCTESGOLUFPD5RYOZ3OPF2GMBSETYLEUYI33MWAC","Add the Pijul section of the Successors talk"],["5FJPILYNAWSUUZNSG3AWSX6U3X7ECZZVTD5TQ2YICCFCSOFR7AEQC","Finish first section"]],"deps":["V6J6DSNMDBJJZQ2XBTRABQLCWBPCUN7ABEQ4NLML26QWGMYMYUYQC"],"known":["IEJDYQSWFL4L73DUWIBDNIPKD4OANRP5K3NDGEDM6FSMIDHKWLBQC","P3PI25SNXZTWEGRXTURJKBVUW6KMV7QJ6P5RYT2FILNCLBPCA6AAC","SAYGZU3IYYSTVWCTESGOLUFPD5RYOZ3OPF2GMBSETYLEUYI33MWAC","5FJPILYNAWSUUZNSG3AWSX6U3X7ECZZVTD5TQ2YICCFCSOFR7AEQC"]},"hunks":[{"FileAdd":{"meta":{"basename":"snapshot-vs-patch.png","metadata":0},"context":[{"change":3,"pos":4883}],"contents":[]}},{"Edit":{"inode":{"change":3,"pos":163533327},"path":"index.html","line":44,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":463},"to":{"change":3,"start":463,"end":644},"introduced_by":3}],"inode":{"change":3,"pos":163533327}}},"contents":[{"Del":" data-separator-vertical=\"^\\r?\\n---\\r?\\n$\">\n \n\n

\n\n"},{"Del":"# Comparison\n"},{"Del":"\n* Tabel die features met Git vergelijken\n"},{"Del":"\n"},{"Del":"note:\n**Time Elapsed:** 14 min.\n\n"}]}},{"Replacement":{"inode":{"change":3,"pos":749},"path":"sections/1-dang-it-git-and-welcome.md","line":36,"ins":{"up_context":[{"change":3,"pos":1720}],"down_context":[{"change":3,"pos":1753}],"flag":"BLOCK","start":90072,"end":90142,"inode":{"change":3,"pos":749}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1720},"to":{"change":3,"start":1720,"end":1753},"introduced_by":3}],"inode":{"change":3,"pos":749}},"ins_contents":[{"Add":"Well, that's understandable!"},{"Add":"Because there's a lot to like about Git:"}],"del_contents":[{"Del":"There's a lot to like about Git:\n"}]}},{"Edit":{"inode":{"change":3,"pos":749},"path":"sections/1-dang-it-git-and-welcome.md","line":40,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":1771}],"down_context":[{"change":3,"pos":1771}],"flag":"BLOCK","start":90143,"end":90204,"inode":{"change":3,"pos":749}}},"contents":[{"Add":"* distributed nature (open-source development, work offline)"}]}},{"Edit":{"inode":{"change":3,"pos":749},"path":"sections/1-dang-it-git-and-welcome.md","line":42,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1778},"to":{"change":3,"start":1778,"end":1839},"introduced_by":3}],"inode":{"change":3,"pos":749}}},"contents":[{"Del":"* distributed nature (open-source development, work offline)\n"}]}},{"Replacement":{"inode":{"change":3,"pos":749},"path":"sections/1-dang-it-git-and-welcome.md","line":44,"ins":{"up_context":[{"change":3,"pos":1867}],"down_context":[{"change":3,"pos":1881}],"flag":"BLOCK","start":90205,"end":90234,"inode":{"change":3,"pos":749}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1867},"to":{"change":3,"start":1867,"end":1881},"introduced_by":3}],"inode":{"change":3,"pos":749}},"ins_contents":[{"Add":"Do we like... for example..."}],"del_contents":[{"Del":"Do we like...\n"}]}},{"Replacement":{"inode":{"change":3,"pos":749},"path":"sections/1-dang-it-git-and-welcome.md","line":48,"ins":{"up_context":[{"change":3,"pos":1983}],"down_context":[{"change":3,"pos":2022}],"flag":"BLOCK","start":90235,"end":90287,"inode":{"change":3,"pos":749}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1983},"to":{"change":3,"start":1983,"end":2022},"introduced_by":3}],"inode":{"change":3,"pos":749}},"ins_contents":[{"Add":"* running a diff when nothing happens? (`--staged`)"}],"del_contents":[{"Del":"* running a diff when nothing happens?\n"}]}},{"Replacement":{"inode":{"change":3,"pos":749},"path":"sections/1-dang-it-git-and-welcome.md","line":50,"ins":{"up_context":[{"change":3,"pos":2060}],"down_context":[{"change":3,"pos":2203}],"flag":"BLOCK","start":90288,"end":90445,"inode":{"change":3,"pos":749}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2060},"to":{"change":3,"start":2060,"end":2203},"introduced_by":3}],"inode":{"change":3,"pos":749}},"ins_contents":[{"Add":"* getting the same conflicts over and over again when we need long-lived branches?"},{"Add":"* having to do a fresh clone because the repo is too messed up to repair?"}],"del_contents":[{"Del":"* getting the same conflicts multiple times when dealing with long-lived branches?\n* fresh clones because the repo is too messed up to repair?\n"}]}},{"Edit":{"inode":{"change":3,"pos":749},"path":"sections/1-dang-it-git-and-welcome.md","line":53,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":2246}],"down_context":[{"change":3,"pos":2246}],"flag":"BLOCK","start":90446,"end":90473,"inode":{"change":3,"pos":749}}},"contents":[{"Add":""},{"Add":"Well... not particularly!"}]}},{"Edit":{"inode":{"change":3,"pos":749},"path":"sections/1-dang-it-git-and-welcome.md","line":66,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2497},"to":{"change":3,"start":2497,"end":2498},"introduced_by":3}],"inode":{"change":3,"pos":749}}},"contents":[{"Del":"\n"}]}},{"Edit":{"inode":{"change":3,"pos":749},"path":"sections/1-dang-it-git-and-welcome.md","line":81,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3024},"to":{"change":3,"start":3024,"end":3049},"introduced_by":3}],"inode":{"change":3,"pos":749}}},"contents":[{"Del":"# Teaching a Git course\n\n"}]}},{"Replacement":{"inode":{"change":3,"pos":749},"path":"sections/1-dang-it-git-and-welcome.md","line":89,"ins":{"up_context":[{"change":3,"pos":3440}],"down_context":[{"change":3,"pos":3527}],"flag":"BLOCK","start":90474,"end":90556,"inode":{"change":3,"pos":749}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3440},"to":{"change":3,"start":3440,"end":3527},"introduced_by":3}],"inode":{"change":3,"pos":749}},"ins_contents":[{"Add":"Sure enough, after 2005, nothing seems to have happened in version control world."}],"del_contents":[{"Del":"Sure enough, after 2005-2006, nothing seems to have happened in version control world.\n"}]}},{"Replacement":{"inode":{"change":3,"pos":749},"path":"sections/1-dang-it-git-and-welcome.md","line":94,"ins":{"up_context":[{"change":3,"pos":3731}],"down_context":[],"flag":"BLOCK","start":90557,"end":90758,"inode":{"change":3,"pos":749}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3731},"to":{"change":3,"start":3731,"end":3972},"introduced_by":3}],"inode":{"change":3,"pos":749}},"ins_contents":[{"Add":"And because I didn't know the answer to her question, I started researching it and found a newer version control systems."},{"Add":"It was called Pijul."},{"Add":"This talk is about Pijul, and how it's different from Git."}],"del_contents":[{"Del":"And because I didn't know the answer to her question, I started researching it and found a few newer version control systems.\nThey were called Fossil and Pijul.\nThis talk is about Pijul, and how its approach is different from Git's approach."}]}},{"Replacement":{"inode":{"change":3,"pos":884},"path":"sections/2-introducing-pijul.md","line":23,"ins":{"up_context":[{"change":3,"pos":824}],"down_context":[{"change":3,"pos":4072}],"flag":"BLOCK","start":90760,"end":90843,"inode":{"change":3,"pos":884}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":824},"to":{"change":3,"start":4035,"end":4072},"introduced_by":3}],"inode":{"change":3,"pos":884}},"ins_contents":[{"Add":"So let's address the name of this version control system first."},{"Add":"[explain the name]"}],"del_contents":[{"Del":"So let's address the name first.\n...\n"}]}},{"Replacement":{"inode":{"change":3,"pos":884},"path":"sections/2-introducing-pijul.md","line":47,"ins":{"up_context":[{"change":3,"pos":1560}],"down_context":[{"change":3,"pos":1769}],"flag":"BLOCK","start":90844,"end":90936,"inode":{"change":3,"pos":884}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1560},"to":{"change":3,"start":1560,"end":1769},"introduced_by":3}],"inode":{"change":3,"pos":884}},"ins_contents":[{"Add":"

written in Rust"},{"Add":"

bootstrapped since April 2017"},{"Add":"

free code hosting at "}],"del_contents":[{"Del":"

written in Rust\n

bootstrapped since April 2017\n

free code hosting at \n"}]}},{"Replacement":{"inode":{"change":3,"pos":884},"path":"sections/2-introducing-pijul.md","line":58,"ins":{"up_context":[{"change":3,"pos":2034}],"down_context":[{"change":3,"pos":2080}],"flag":"BLOCK","start":90937,"end":90971,"inode":{"change":3,"pos":884}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2034},"to":{"change":3,"start":2034,"end":2080},"introduced_by":3}],"inode":{"change":3,"pos":884}},"ins_contents":[{"Add":"So they 'eat their own dog food'."}],"del_contents":[{"Del":"Like IntelliJ, they 'eat their own dog food'.\n"}]}},{"Replacement":{"inode":{"change":3,"pos":884},"path":"sections/2-introducing-pijul.md","line":72,"ins":{"up_context":[{"change":3,"pos":2790}],"down_context":[{"change":3,"pos":2919}],"flag":"BLOCK","start":90972,"end":91121,"inode":{"change":3,"pos":884}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2790},"to":{"change":3,"start":2790,"end":2919},"introduced_by":3}],"inode":{"change":3,"pos":884}},"ins_contents":[{"Add":"

No rebases, and merges are hardly needed; applying a patch is like git cherry-pick.

"}],"del_contents":[{"Del":"

No merges or rebases; applying a patch is like git cherry-pick.

\n"}]}},{"Edit":{"inode":{"change":3,"pos":884},"path":"sections/2-introducing-pijul.md","line":76,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":2932}],"down_context":[{"change":3,"pos":2932}],"flag":"BLOCK","start":91122,"end":91202,"inode":{"change":3,"pos":884}}},"contents":[{"Add":"Let's zoom in on this \"patch-oriented design\"."},{"Add":""},{"Add":"[walk through the bullet list]"},{"Add":""}]}},{"Edit":{"inode":{"change":3,"pos":884},"path":"sections/2-introducing-pijul.md","line":88,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":3292}],"down_context":[],"flag":"BLOCK","start":91203,"end":92074,"inode":{"change":3,"pos":884}}},"contents":[{"Add":""},{"Add":"---"},{"Add":""},{"Add":"## If commits were bank transactions"},{"Add":""},{"Add":""},{"Add":" "},{"Add":" "},{"Add":" "},{"Add":" "},{"Add":" "},{"Add":" "},{"Add":" "},{"Add":" "},{"Add":" "},{"Add":" "},{"Add":" "},{"Add":" "},{"Add":" "},{"Add":" "},{"Add":" "},{"Add":" "},{"Add":" "},{"Add":" "},{"Add":" "},{"Add":"

"},{"Add":"	snapshot	patch
initial balance	`100`	`+100`
salary	`400`	`+300`
heating	`0`	`-400`

"},{"Add":""},{"Add":""},{"Add":"note:"},{"Add":""},{"Add":"Snapshots store account balance, patches store deltas."},{"Add":"Which means patch order doesn't matter for the final result."}]}},{"Edit":{"inode":{"change":3,"pos":953},"path":"sections/3-demo.md","line":4,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3426},"to":{"change":3,"start":3426,"end":3427},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3427},"to":{"change":2,"start":8698586,"end":8698620},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":8698620},"to":{"change":3,"start":3427,"end":3431},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3427},"to":{"change":3,"start":3427,"end":3431},"introduced_by":3}],"inode":{"change":3,"pos":953}}},"contents":[{"Del":"\n"},{"Del":"note:\n**Time Elapsed:** 6 min.\n\n\n\n"},{"Del":"---\n"}]}},{"Edit":{"inode":{"change":3,"pos":953},"path":"sections/3-demo.md","line":5,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3432},"to":{"change":3,"start":3432,"end":3441},"introduced_by":3}],"inode":{"change":3,"pos":953}}},"contents":[{"Del":"## Demo\n\n"}]}},{"Edit":{"inode":{"change":3,"pos":953},"path":"sections/3-demo.md","line":10,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":3506}],"down_context":[{"change":3,"pos":3506}],"flag":"BLOCK","start":92076,"end":92101,"inode":{"change":3,"pos":953}}},"contents":[{"Add":"**Time Elapsed:** 6 min."}]}},{"Edit":{"inode":{"change":3,"pos":163536312},"path":"sections/a-wrap-up.md","line":2,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":5999},"to":{"change":3,"start":5999,"end":6009},"introduced_by":3}],"inode":{"change":3,"pos":163536312}}},"contents":[{"Del":"# Wrap-up\n"}]}},{"Replacement":{"inode":{"change":3,"pos":163536312},"path":"sections/a-wrap-up.md","line":3,"ins":{"up_context":[{"change":3,"pos":4213}],"down_context":[{"change":3,"pos":6009}],"flag":"BLOCK","start":92103,"end":92115,"inode":{"change":3,"pos":163536312}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":4213},"to":{"change":3,"start":4213,"end":4240},"introduced_by":3}],"inode":{"change":3,"pos":163536312}},"ins_contents":[{"Add":"# Now what?"}],"del_contents":[{"Del":"## When To (Not) Use Pijul\n"}]}},{"Replacement":{"inode":{"change":3,"pos":163536312},"path":"sections/a-wrap-up.md","line":5,"ins":{"up_context":[{"change":3,"pos":6010}],"down_context":[{"change":2,"pos":8698700}],"flag":"BLOCK","start":92116,"end":92148,"inode":{"change":3,"pos":163536312}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":6010},"to":{"change":3,"start":4241,"end":4524},"introduced_by":3}],"inode":{"change":3,"pos":163536312}},"ins_contents":[{"Add":"note:"},{"Add":"**Time Elapsed:** 14 min."}],"del_contents":[{"Del":"

Now what?

Git's snapshotting might be too technical for the average user. So try Pijul for a change!

\n Time Elapsed: 15 min.\n"}]}},{"Replacement":{"inode":{"change":3,"pos":163536312},"path":"sections/a-wrap-up.md","line":8,"ins":{"up_context":[{"change":2,"pos":8698701}],"down_context":[{"change":2,"pos":8698702}],"flag":"BLOCK","start":92149,"end":92153,"inode":{"change":3,"pos":163536312}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":8698701},"to":{"change":3,"start":4533,"end":4797},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":4533},"to":{"change":3,"start":4533,"end":4797},"introduced_by":3}],"inode":{"change":3,"pos":163536312}},"ins_contents":[{"Add":"---"}],"del_contents":[{"Del":" 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.\n

\n"}]}},{"Replacement":{"inode":{"change":3,"pos":163536312},"path":"sections/a-wrap-up.md","line":10,"ins":{"up_context":[{"change":2,"pos":8698703}],"down_context":[{"change":3,"pos":4797}],"flag":"BLOCK","start":92154,"end":92178,"inode":{"change":3,"pos":163536312}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":8698703},"to":{"change":2,"start":8698703,"end":8698709},"introduced_by":2}],"inode":{"change":3,"pos":163536312}},"ins_contents":[{"Add":"## When Do I Use Pijul?"}],"del_contents":[{"Del":"note:\n"}]}},{"Replacement":{"inode":{"change":3,"pos":163536312},"path":"sections/a-wrap-up.md","line":12,"ins":{"up_context":[{"change":3,"pos":4798}],"down_context":[{"change":2,"pos":8698736}],"flag":"BLOCK","start":92179,"end":93221,"inode":{"change":3,"pos":163536312}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":4798},"to":{"change":2,"start":8698710,"end":8698736},"introduced_by":2}],"inode":{"change":3,"pos":163536312}},"ins_contents":[{"Add":"* For a hobby project, so you can get the feel of it "},{"Add":"* If your team members currently struggle with Git "},{"Add":"* If you spend too much time on rebasing, merging and conflict resolution "},{"Add":"* If you can self-host or use the Pijul Nest "},{"Add":""},{"Add":"**Try Pijul for a change!** "},{"Add":""},{"Add":" "},{"Add":""},{"Add":"note: "},{"Add":""},{"Add":"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."},{"Add":""},{"Add":"---"}],"del_contents":[{"Del":"**Time Elapsed:** 15 min.\n"}]}}],"owner":"hannotify","repo":"a-birds-eye-view-of-version-control-with-pijul","token":"YwAf2J30lSBdQv+kjxuTfcRPaQSCerb5mJwoTOGXd6k=","login":null}

…

Dependencies

Change contents