Skip to content

Commit 3d5d24f

Browse files
fix format in build-config-imports.md
Misformatted .travis.yml reference in deep_merge section fixed
1 parent cc3ed58 commit 3d5d24f

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

user/build-config-imports.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,14 @@ import:
231231
```
232232
{: data-file=".travis.yml"}
233233

234-
This mode first merges your `.travis.yml` contents into the `one.yml` file (overwriting, if required, sections in `one.yml` with content from `.travis.yml`). The results are merged into the `two.yml` file (again, items in the result of the previous merge win over what’s in this one, as the `deep_merge` mode is specified here).
235-
236-
The reasoning behind this is that in many cases when you import something to your `.travis.yml’ file, you want to be able to overwrite or customize that imported configuration with config in your `.travis.yml` file.
234+
This mode first merges your `.travis.yml` contents into the `one.yml` file (overwriting,
235+
if required, sections in `one.yml` with content from `.travis.yml`). The results are
236+
merged into the `two.yml` file (again, items in the result of the previous merge win
237+
over what’s in this one, as the `deep_merge` mode is specified here).
238+
239+
The reasoning behind this is that in many cases when you import something to your
240+
`.travis.yml` file, you want to be able to overwrite or customize that imported
241+
configuration with config in your `.travis.yml` file.
237242

238243
### Merge
239244

0 commit comments

Comments
 (0)