Backupppert/oh-my-git
1
0
Fork 0
mirror of https://github.com/git-learning-game/oh-my-git.git synced 2024-11-20 16:20:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Simplify solution for level 'stash-merge' by adding recipe to index

Browse source 
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:
Ben Donatelli 2021-03-11 20:41:53 -06:00
parent ec9b467cc6
commit fd1a770a94
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
levels/stash/stash-merge
View file

@ -35,6 +35,7 @@ git stash push
echo "- Pinch of Salt" >> recipe
git checkout main
git add recipe
[win]