Skip to content

Commit 028b852

Browse files
authored
Merge pull request #219 from actionjack/fix_errors
Fix snippet merge errors
2 parents fe50c46 + 2e794b6 commit 028b852

11 files changed

+38
-22
lines changed

‎README.md‎

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ environment:
3737
cultures](https://julesx.com/toxic-work-culture-forcing-best-employees-quit/))
3838
do not attract nor retain top talent it does the exact opposite.
3939

40-
> "Suffering increases in proportion to knowledge of a better way." \>
41-
> Jim Hickstein
40+
> "Suffering increases in proportion to knowledge of a better way."
41+
42+
> > Jim Hickstein
4243
4344
## Making it easy to get work done from day one
4445

@@ -49,8 +50,9 @@ Simplify, simplify and after that simplify some more
4950
```{=html}
5051
</summary>
5152
```
52-
> "Everything should be made as simple as possible, but no simpler." \>
53-
> Albert Einstein
53+
> "Everything should be made as simple as possible, but no simpler."
54+
55+
> > Albert Einstein
5456
5557
Reduce the time spent learning environments by building them to be easy
5658
to understand, with a focus on a making it possible for every developer
@@ -70,7 +72,9 @@ The raw basics
7072
</summary>
7173
```
7274
> "Without a solid foundation of raw basics, any structure built upon it
73-
> is liable to crumble and fall." \> Unknown
75+
> is liable to crumble and fall."
76+
77+
> > Unknown
7478
7579
- Have internet access sorted out for new starts or let them know if
7680
there isn't any.
@@ -108,10 +112,11 @@ Aim to create a culture of empathy and psychological safety
108112
```
109113
> "It's possible for good people, in perversely designed systems, to
110114
> casually perpetrate acts of great harm on strangers, sometimes without
111-
> ever realising it." \>[Ben Goldacre](http://www.badscience.net/),
112-
> [Bad
113-
> Pharma](https://www.amazon.co.uk/dp/0865478007?tag=contindelive-20),
114-
> p. xi
115+
> ever realising it."
116+
117+
> > [Ben Goldacre](http://www.badscience.net/), [Bad
118+
> > Pharma](https://www.amazon.co.uk/dp/0865478007?tag=contindelive-20),
119+
> > p. xi
115120
116121
- Embrace the standard of [The Humble
117122
Learner](https://www.linkedin.com/pulse/myth-sufficiently-smart-engineer-aaron-blohowiak/),
@@ -172,7 +177,9 @@ Make it easy to understand and do the things
172177
</summary>
173178
```
174179
> "Stale documentation is not only misleading, it is positively
175-
> harmful." \> Riona MacNamara (@rionam)
180+
> harmful."
181+
182+
> > Riona MacNamara (@rionam)
176183
177184
It's important to either have or do the following:
178185

@@ -277,7 +284,8 @@ Make it easy to get stuff done
277284
> ["Complexity exacts a staggering tax on your humans. Good Ops
278285
> engineers attempt to pay down that
279286
> tax."](https://twitter.com/bridgetkromhout/status/647333814411358208)
280-
> \>[Charity Majors](https://twitter.com/mipsytipsy)
287+
288+
> > [Charity Majors](https://twitter.com/mipsytipsy)
281289
282290
- Have all relevant user accounts and access setup and ready
283291
- Create [Operations
@@ -351,7 +359,9 @@ How should we be doing the stuff
351359
</summary>
352360
```
353361
> "If you can't describe what you are doing as a process, you don't know
354-
> what you're doing." \> W. Edwards Deming
362+
> what you're doing."
363+
364+
> > W. Edwards Deming
355365
356366
- Everyone seems to have their own particular spin on Agile Scrum or
357367
Kanban, so explain up front what the process is and refine when and
@@ -466,8 +476,9 @@ How should we be doing the stuff
466476

467477
## Version control management
468478

469-
> "Those who cannot remember the past are condemned to repeat it." \>
470-
> George Santayana
479+
> "Those who cannot remember the past are condemned to repeat it."
480+
481+
> > George Santayana
471482
472483
```{=html}
473484
<summary>
@@ -540,7 +551,9 @@ How do we safely change things
540551
```{=html}
541552
</summary>
542553
```
543-
> "Measure twice, cut once" \> Proverb
554+
> "Measure twice, cut once"
555+
556+
> > Proverb
544557
545558
- Make it easy to set up your local development environment, you
546559
should not have to do the following just so you can start work:
@@ -669,7 +682,3 @@ International License](http://creativecommons.org/licenses/by/4.0/).
669682

670683
[CC Attribution 4.0 International](LICENSE) © [Martin
671684
Jackson](http://uncommonsense-uk.com/)
672-
673-
```{=html}
674-
<!-- Definitions. -->
675-
```

‎source/000_introduction.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ Nobody (at least nobody I know…) *wants* to work in a difficult environment:
1111
* Bad environments (and [broken cultures](https://julesx.com/toxic-work-culture-forcing-best-employees-quit/)) do not attract nor retain top talent it does the exact opposite.
1212

1313
> “Suffering increases in proportion to knowledge of a better way.”
14+
1415
>> Jim Hickstein
1516

‎source/010_making_it_easy.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<summary>Simplify, simplify and after that simplify some more</summary>
44

55
> “Everything should be made as simple as possible, but no simpler.”
6+
67
>> Albert Einstein
78
89
Reduce the time spent learning environments by building them to be easy to understand, with a focus on a making it possible for every developer (new or old) to become effective in the shortest possible amount of time.

‎source/020_the_basics.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<summary>The raw basics</summary>
44

55
> "Without a solid foundation of raw basics, any structure built upon it is liable to crumble and fall."
6+
67
>> Unknown
78
89
* Have internet access sorted out for new starts or let them know if there isn't any.

‎source/030_culture.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<summary>Aim to create a culture of empathy and psychological safety </summary>
44

55
> “It's possible for good people, in perversely designed systems, to casually perpetrate acts of great harm on strangers, sometimes without ever realising it.”
6+
67
> > [Ben Goldacre](http://www.badscience.net/), [Bad Pharma](https://www.amazon.co.uk/dp/0865478007?tag=contindelive-20), p. xi
78
89
* Embrace the standard of [The Humble Learner](https://www.linkedin.com/pulse/myth-sufficiently-smart-engineer-aaron-blohowiak/), The Humble Learner accepts the limits of human capacity while seeking to grow their technical and empathetic skills

‎source/040_documentation.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<summary>Make it easy to understand and do the things</summary>
44

55
> “Stale documentation is not only misleading, it is positively harmful.”
6+
67
>> Riona MacNamara (@rionam)
78
89
It's important to either have or do the following:

‎source/050_Operations.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<summary>Make it easy to get stuff done</summary>
44

55
> [“Complexity exacts a staggering tax on your humans. Good Ops engineers attempt to pay down that tax.”](https://twitter.com/bridgetkromhout/status/647333814411358208)
6+
67
>> [Charity Majors](https://twitter.com/mipsytipsy)
78
89
* Have all relevant user accounts and access setup and ready

‎source/060_Processes.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<summary>How should we be doing the stuff</summary>
44

55
> “If you can't describe what you are doing as a process, you don't know what you're doing.”
6+
67
>> W. Edwards Deming
78
89
* Everyone seems to have their own particular spin on Agile Scrum or Kanban, so explain up front what the process is and refine when and if necessary.

‎source/070_VCS.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
## Version control management
22

33
> “Those who cannot remember the past are condemned to repeat it.”
4+
45
>> George Santayana
56
67
<summary>How do we safely change the things</summary>

‎source/080_Development_environments.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<summary>How do we safely change things</summary>
44

55
> “Measure twice, cut once”
6+
67
>> Proverb
78
89
* Make it easy to set up your local development environment, you should not have to do the following just so you can start work:

0 commit comments

Comments
(0)