mirror of
https://github.com/git-learning-game/oh-my-git.git
synced 2024-06-26 14:28:03 +02:00
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.
This commit is contained in:
parent
ec9b467cc6
commit
fd1a770a94
|
@ -35,6 +35,7 @@ git stash push
|
||||||
echo "- Pinch of Salt" >> recipe
|
echo "- Pinch of Salt" >> recipe
|
||||||
|
|
||||||
git checkout main
|
git checkout main
|
||||||
|
git add recipe
|
||||||
|
|
||||||
[win]
|
[win]
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue