diff -r 8406d9b06130 -r a78310b900e3 docs/tutorial/slides.md --- a/docs/tutorial/slides.md Sat Apr 27 19:32:03 2019 -0400 +++ b/docs/tutorial/slides.md Sat Apr 27 19:42:42 2019 -0400 @@ -1130,9 +1130,9 @@ À deux: -- troubles, divergence, orphan -- troubles visualization -- troubles resolution +- instability, divergence, orphan +- instability visualization +- instability resolution - collaboration workflow Parler du happy path d'abord --> @@ -2025,7 +2025,7 @@ -## Troubles +## Instability #### Evolution @@ -2041,7 +2041,7 @@ #### instability -(currently: *troubles*) +(currently: *instability*) * **Orphans:** ancestors were rewritten @@ -2091,7 +2091,7 @@ -## extra - Troubles +## extra - Instability #### Obsolete