⚠️ CONFLICT! Lineage pull request for: skeleton #17
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
The mirrors-isort respository has been deprecated per this Pull Request: pre-commit/mirrors-isort#13 Since isort includes pre-commit configuration in current versions we will switch to using it directly.
This comment references the mirrors-isort repository that we are no longer using.
We have seen a number of issues related to this hook ever since it was re-enabled. It will need to remain disabled until at least the 0.13 Terraform release, and can only be re-enabled if all issues we have seen have been resolved in how `terraform validate` operates.
…bled. Review noticed that there lacked a determination for what we were doing about the problem with the terraform_validate hook. I described the problems but failed to mention what our path forward would be. This commit rectifies that oversight.
…om:cisagov/skeleton-generic into improvements/pre-commit_autoupdate_2020-05
…e_2020-05 Update pre-commit Hook Versions
# Conflicts: # .pre-commit-config.yaml
felddy
requested review from
a team,
dav3r,
hillaryj,
jsf9k and
mcdonnnj
as code owners
jsf9k
requested changes
May 14, 2020
jsf9k
approved these changes
May 14, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Lineage Pull Request: CONFLICT
Lineage has created this pull request to incorporate new changes found in an
upstream repository:
Upstream repository:
https://github.com/cisagov/skeleton-generic.gitCheck the changes in this pull request to ensure they won't cause issues with
your project.
The
lineage/skeletonbranch has one or more unresolved merge conflictsthat you must resolve before merging this pull request!
How to resolve the conflicts
Clone the
lineage/skeletonbranch locally:git clone --single-branch --branch lineage/skeleton git@github.com:cisagov/development-guide.gitReview each of the following files looking for conflict-resolution markers:
.pre-commit-config.yamlResolve each of the conflicts and
addyour changes to the branch:git add .pre-commit-config.yamlOnce all the changes have been added,
commitandpushthe changes back toGitHub:
Wait for all the automated tests to pass.
Check the "Everything is cool" checkbox below:
Mark this draft pull request "Ready for review".
Note: You are seeing this because one of this repository's maintainers has
configured Lineage to open pull requests.
For more information:
🛠 Lineage configurations for this project are stored in
.github/lineage.yml📚 Read more about Lineage