Ignores local config folder to improve dev workflow #707
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
0xdeadbeefc0ffee
pushed a commit
that referenced
this pull request
Aug 7, 2015
Ignores local config folder to improve dev workflow
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ignoring the local config folder improves dev workflow by reducing the chance of merge conflicts and accidentally adding local configuration files to commits.
When this pull request is merged there is a one-time upgrade process (see below) that needs to be ran by anyone merging a branch or release with this fix.
git fetch --tags.git checkout -b local.git add app/config/local; git commit -m 'Adds local config.'.git add -A; git commit -m 'Local changes.'.git merge TAG. Where TAG is the release (i.e. “v1.3.4”).git rm --cached app/config/local -r; git add app/config/local; git commit -m 'Fixes local config.'; php -r "readfile('https://getcomposer.org/installer');" | php; php composer.phar install.php artisan migrate --env=YOUR_ENV. WhereYOUR_ENVshould be replaced with your environment (likely to be local or production).@daniel-abbey this is what you were testing on Wednesday.