⚠️ CONFLICT! Lineage pull request for: skeleton #15
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
…ignore Add .mypy_cache to .gitignore
This should resolve the issue seen when the Python version changes before there is an update to .pre-commit-config.yml which results in pre-commit pointing to a non-existent Python installation.
Incorporate the Python version into keys for pip and pre-commit caches.
…cks to environment variables declared before the job block.
Change Cache Paths to Environment Variables
…ame as long as they are not nested in the same heading group.
Add markdownlint Configuration Option for MD024
terraform_validate_no_variables was changed to terraform_validate in the following commit: antonbabenko/pre-commit-terraform@35e0356. Ran pre-commit autoupdate.
Update pre-commit Hooks and Fix Broken Hook ID
`pre-commit-terraform` hook since the PR I submitted, antonbabenko/pre-commit-terraform#100, was approved. This will fix issues with `skeleton-tf-module` related to multiple directories with Terraform code.
…hen the failure is with setup rather than hooks running.
…lding. Adjust description for pre-commit hook setup to better convey what is being done.
…commit-terraform_hook Update pre-commit Hooks to Include Bugfix
Update CODEOWNERS
Allow events from apb to rebuild this repository weekly.
# Conflicts: # .gitignore # .pre-commit-config.yaml
This doesn't play well with this project.
felddy
requested review from
a team,
dav3r,
hillaryj,
jsf9k and
mcdonnnj
as code owners
dav3r
approved these changes
May 13, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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:
Resolve each of the conflicts and
addyour changes to the branch:git add .gitignore .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