From fd1a770a94b3ba0f9c4a728ce13038b44fcdc4fe Mon Sep 17 00:00:00 2001 From: Ben Donatelli Date: Thu, 11 Mar 2021 20:41:53 -0600 Subject: [PATCH] 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. --- levels/stash/stash-merge | 1 + 1 file changed, 1 insertion(+) diff --git a/levels/stash/stash-merge b/levels/stash/stash-merge index b11fed5..a8c9ac1 100644 --- a/levels/stash/stash-merge +++ b/levels/stash/stash-merge @@ -35,6 +35,7 @@ git stash push echo "- Pinch of Salt" >> recipe git checkout main +git add recipe [win]