@@ -13,7 +13,7 @@ keypoints:
13
13
14
14
## Frequent situation: interrupted work
15
15
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:
17
17
18
18
- You are in the middle of a Jackson-Pollock-style debugging spree with 27 modified files
19
19
and debugging prints everywhere.
@@ -87,15 +87,15 @@ You already know how to do this...
87
87
1 . Optional: Go through the process above. Start a change, create new
88
88
branch and store your changes. Go back to master and fix something
89
89
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?
91
91
Continue using it? etc.
92
92
93
93
---
94
94
95
95
## Storing various junk you don't need but don't want to get rid of
96
96
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
98
98
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
100
100
try to use a branch after a long time, conflicts might get really bad
101
101
but at least you have the data still.
0 commit comments