Backupppert/oh-my-git
1
0
Fork 0
mirror of https://github.com/git-learning-game/oh-my-git.git synced 2025-03-27 17:03:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix spelling error in level stash-merge

Browse source
This commit is contained in:
Charles Haines 2025-01-27 22:24:15 -05:00 • committed by blinry
parent 7f2fa3039f
commit 290798d774
1 changed files with 2 additions and 2 deletions

4
levels/stash/stash-merge
View file

@ -3,8 +3,8 @@ 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.
When you want to re-apply your changes but you already continued working on your file, you might get
a merge conflict! Let's practice 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.