Skip to content

Commit dd73a0f

Browse files
committed
Clarified conflicting rules in multiple sections defined in the same .editorconfig file
1 parent cecca53 commit dd73a0f

1 file changed

Lines changed: 4 additions & 11 deletions

File tree

index.rst

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.. Copyright (c) 2019--2025 EditorConfig Team
12
All rights reserved.
23
34
Redistribution and use in source and binary forms, with or without
@@ -183,13 +184,8 @@ special characters for wildcard matching:
183184
If the glob contains a path separator (a ``/`` not inside square brackets), then the glob is relative
184185
to the directory level of the particular `.editorconfig` file itself.
185186
Otherwise the pattern may also match at any level below the `.editorconfig`
186-
level.
187-
188-
Therefore, a leading slash is not relevant if there is already a slash in the middle of the pattern.
189-
Thus, the globs `/subdir/*.c` and `subdir/*.c` must yield the same result.
190-
191-
For example, ``*.c`` matches any file that ends with ``.c`` in the
192-
directory of ``.editorconfig`` or any other directory below one that stores this ``.editorconfig``.
187+
level. For example, ``*.c`` matches any file that ends with ``.c`` in the
188+
directory of ``.editorconfig`` or any other directory below one that stores this ``.editorconfig``.
193189
However, the glob ``subdir/*.c`` only matches files that end
194190
with ``.c`` in the ``subdir`` directory in the directory of ``.editorconfig``.
195191

@@ -424,7 +420,4 @@ this specification.
424420
.. _plugin-tests repository: https://github.com/editorconfig/editorconfig-plugin-tests
425421
.. _Semantic Versioning 2.0.0: https://semver.org/spec/v2.0.0.html
426422
.. _specification repository: https://github.com/editorconfig/specification
427-
<<<<<<< HEAD
428-
.. _gitignore format: https://git-scm.com/docs/gitignore#_pattern_format
429-
=======
430-
>>>>>>> 4c747a0 (Code review clean-up)
423+

0 commit comments

Comments
 (0)