From 583239b893ead504b343ed07d24997abdc0c2fca Mon Sep 17 00:00:00 2001 From: Elias Probst Date: Sun, 8 Mar 2015 09:46:10 +0100 Subject: [PATCH] Suggest a separate repo for `top.sls`. This replaces the suggestion to keep `top.sls` out of other branches which is rather unpractical, as it would require to manually delete it from each new created branch and prevent deleting it when merging the branch back into `master`. --- doc/topics/tutorials/gitfs.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/topics/tutorials/gitfs.rst b/doc/topics/tutorials/gitfs.rst index a1af9428b3..9ed5c84a7b 100644 --- a/doc/topics/tutorials/gitfs.rst +++ b/doc/topics/tutorials/gitfs.rst @@ -444,8 +444,8 @@ be used: ``top.sls`` files from different branches will be merged into one at runtime. Since this can lead to overly complex configurations, the recommended setup is -to have the ``top.sls`` file only in the master branch and use -environment-specific branches for state definitions. +to have a separate repository, containing only the ``top.sls`` file with just +one single ``master`` branch. To map a branch other than ``master`` as the ``base`` environment, use the :conf_master:`gitfs_base` parameter.