oh-my-git/levels/stash/stash-merge
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

55 lines
945 B
Plaintext

title = Merging popped stash
cards = checkout commit-auto merge reset-hard
[description]
When you want to reapply your changes but you already continued working on your file, you might get
a merge conflict! Let's practise this situation.
Pop the changes from the stash with
git stash pop
and resolve the merge conflict. Commit the resolved changes and clear the stash stack afterwards.
---
tipp1
---
tipp2
---
tipp3
[setup]
echo "Apple Pie:" > recipe
git add .
git commit -m "creating a recipe"
echo "- 4 Apples" >> recipe
git add .
git commit -m "Adding ingredients"
echo "- 500g Flour" >> recipe
git stash push
echo "- Pinch of Salt" >> recipe
git checkout main
git add recipe
[win]
# Did you resolve the confict and commit?
{ git show HEAD | grep "Flour"; } && { git show HEAD | grep "Salt"; }
# Did you clear stash stack?
test "$(git stash list | wc -l)" -eq 0
[actions]
[congrats]
Yay, you got your changes back! :)