3 Commits

Author SHA1 Message Date
Bjarke Sporring
c20041efde fix: stash tasks in readme 2026-01-21 12:59:32 +01:00
Bjarke Sporring
84ed357feb fix: pwsh doesn't like @{} since it's a pwsh hashtable. Should wrap in a string 2026-01-21 12:58:25 +01:00
Bjarke Sporring
9659d82d2a feat: add a FAQ section 2026-01-21 12:27:09 +01:00
2 changed files with 17 additions and 15 deletions

View File

@@ -95,7 +95,8 @@ Suddenly, your teammate reports a **critical security bug** in production! You n
2. **Check your current status:**
```pwsh
git status
git status # See which files are changed
git diff # See all the changes in a diffview
```
You should see modified `login.py` (uncommitted changes)
@@ -116,15 +117,12 @@ Suddenly, your teammate reports a **critical security bug** in production! You n
```
6. **Open app.py and find the bug:**
```pwsh
cat app.py
```
Look for the comment "# BUG: This allows unauthenticated access!"
7. **Fix the bug** by editing app.py:
- Remove the buggy comment line
- You can leave the implementation as-is or improve it
- The important thing is removing the comment that says "allows unauthenticated access"
- The important thing is removing the comment that says "BUG: This allows unauthenticated access"
8. **Commit the fix:**
```pwsh
@@ -143,10 +141,8 @@ Suddenly, your teammate reports a **critical security bug** in production! You n
```
This applies the stash and removes it from the stash stack
11. **Complete the TODOs in login.py:**
11. **Remove all the TODOs in login.py:**
- Open login.py in your editor
- Complete the login method (verify password and return session)
- Add a logout method
- Remove all TODO comments
12. **Commit your completed feature:**
@@ -194,10 +190,7 @@ git stash pop
git stash apply
# Apply a specific stash
git stash apply stash@{1}
# Apply a specific stash by number
git stash apply 1
git stash apply "stash@{1}"
```
### Managing Stashes
@@ -207,7 +200,7 @@ git stash apply 1
git stash drop
# Drop a specific stash
git stash drop stash@{1}
git stash drop "stash@{1}"
# Clear all stashes
git stash clear
@@ -293,10 +286,10 @@ git stash pop
git stash list
# Show summary of what changed
git stash show stash@{0}
git stash show "stash@{0}"
# Show full diff
git stash show -p stash@{0}
git stash show -p "stash@{0}"
```
### "Stash conflicts when I apply"

9
06-FAQ.md Normal file
View File

@@ -0,0 +1,9 @@
# Questions
## Is it possible to recover lost branches or commits?
Yes it is, however this is dependent on whether or not git has done an internal garbage collection which there usually is a retention period of 30 days.
**Beware** this is advanced territory and is usually only relevant when you've messed up with a `git reset` or a deletion of a branch
To read more, you can read the documentation here <https://git-scm.com/docs/git-reflog>