Skip to content

Commit dca2446

Browse files
committed
small language fixes
1 parent 1943dbd commit dca2446

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

_episodes/12-interrupted.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ keypoints:
1313

1414
## Frequent situation: interrupted work
1515

16-
We are saying that you should make nice, prefect code. But the real world is much more chaotic.
16+
We all wish that we could write beautiful perfect code. But the real world is much more chaotic:
1717

1818
- You are in the middle of a Jackson-Pollock-style debugging spree with 27 modified files
1919
and debugging prints everywhere.
@@ -87,15 +87,15 @@ You already know how to do this...
8787
1. Optional: Go through the process above. Start a change, create new
8888
branch and store your changes. Go back to master and fix something
8989
else. Resume your work and merge the new branch.
90-
2. Discuss how to resume your former work. Can you git rid of branch?
90+
2. Discuss how to resume your former work. Can you git rid of a branch?
9191
Continue using it? etc.
9292

9393
---
9494

9595
## Storing various junk you don't need but don't want to get rid of
9696

97-
It's often that you do something and don't need it, but you don't want
97+
It happens often that you do something and don't need it, but you don't want
9898
to lose it right away. You can use either of the above strategies to
99-
stash/branch it away: branches is probably better. Note that if you
99+
stash/branch it away: using branches is probably better. Note that if you
100100
try to use a branch after a long time, conflicts might get really bad
101101
but at least you have the data still.

0 commit comments

Comments
 (0)