Ben Donatelli fd1a770a94 Simplify solution for level 'stash-merge' by adding recipe to index ... If recipe isn't part of index, user receives an error warning that local changes to file would be overwritten by merge when executing `git stash pop`. Since the focus of this lesson is learning about popping the stash, starting with recipe already added to index neatly sidesteps this error.		2021-03-11 20:53:13 -06:00
..
bisect	less commits in bisect level	2021-02-11 11:32:55 +01:00
branches	Polish some levels in the first chapters, and the branch-delete icon	2021-02-19 11:52:24 +01:00
changing-the-past	Fix baguette and coffee mixup in Ch. Rebase	2021-03-04 10:07:35 +01:00
files	Make win condition in level about adding files case-insensitive	2021-03-08 14:51:07 +01:00
index	Insert a level in the intro that forces players to use the command line	2021-02-18 16:04:14 +01:00
intro	Polish some levels in the first chapters, and the branch-delete icon	2021-02-19 11:52:24 +01:00
low-level	Add a high-level level about remotes	2020-10-12 19:23:10 +02:00
merge	Bring level sequence up to date	2021-02-07 10:59:24 +01:00
remotes	Merge remote-tracking branch 'origin/main' into main	2021-01-14 11:44:50 +01:00
sandbox	Bring level sequence up to date	2021-02-07 10:59:24 +01:00
shit-happens	Tweaks to "shit-happens", like an ordering	2021-01-05 17:14:50 +01:00
stash	Simplify solution for level 'stash-merge' by adding recipe to index	2021-03-11 20:53:13 -06:00
tags	Fixed description text of "remove tags" level	2021-03-09 17:15:54 +01:00
unused	Merge remote-tracking branch 'origin/main' into main	2021-01-14 11:44:50 +01:00
workflows	Insert a level in the intro that forces players to use the command line	2021-02-18 16:04:14 +01:00
sequence	Bring level sequence up to date	2021-02-07 10:59:24 +01:00