Clarify purpose of local/upstream extras

jaraco · Dec 29, 2018 · 4310c97 · 4310c97
1 parent 8ac0f87
commit 4310c97
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/skeleton.md b/skeleton.md
@@ -68,7 +68,7 @@ The setup.cfg file implements the following features:
 - Supplies two 'extras':
   - testing: requirements for running tests
   - docs: requirements for building docs
-  - these extras split the declaration into "upstream" (requirements as declared by the skeleton) and "local" (those specific to the local project)
+  - these extras split the declaration into "upstream" (requirements as declared by the skeleton) and "local" (those specific to the local project); these markers help avoid merge conflicts
 - Placeholder for defining entry points
 
 Additionally, the setup.py file declares `use_scm_version` which relies on [setuptools_scm](https://pypi.org/project/setuptools_scm) to do two things: