4 commits

Author	SHA1	Message	Date
blinry	1ca3e9d208	Merge pull request #58 from mundifex/simplify-stash-merge ... Simplify solution for level 'stash-merge' by adding recipe to index	2021-03-24 14:11:33 +01:00
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
Mikko Reinikainen	d9b6165aa8	Fix goal and congrats messages	2021-03-10 08:17:26 +02:00
bleeptrack	9109394271	stashing	2021-01-05 16:44:17 +01:00