Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix spelling error in level stash-merge #226

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix spelling error in level stash-merge #226

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions levels/stash/stash-merge
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down