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-packer.git
Remote branch: HEAD

Check the changes in this pull request to ensure they won't cause issues with your project.

The lineage/skeleton branch has one or more unresolved merge conflicts that you must resolve before merging this pull request!

How to resolve the conflicts

1. Take ownership of this pull request by removing any other assignees.

2. Clone the repository locally, and reapply the merge:

   git clone git@github.com:cisagov/teamserver-packer.git teamserver-packer
   cd teamserver-packer
   git remote add skeleton https://github.com/cisagov/skeleton-packer.git
   git remote set-url --push skeleton no_push
   git switch develop
   git switch --create lineage/skeleton --track origin/develop
   git pull skeleton HEAD
   git status

3. Review the changes displayed by the status command. Fix any conflicts and possibly incorrect auto-merges.

4. After resolving each of the conflicts, add your changes to the branch, commit, and push your changes:

   git add version.txt 
   git commit
   git push --force --set-upstream origin lineage/skeleton

   Note that you may append to the default merge commit message that git creates for you, but please do not delete the existing content. It provides useful information about the merge that is being performed.

5. Wait for all the automated tests to pass.

6. Confirm each item in the "Pre-approval checklist" below.

7. Remove any of the checklist items that do not apply.

8. Ensure every remaining checkbox has been checked.

9. Mark this draft pull request "Ready for review".

✅ Pre-approval checklist

• ✌️ The conflicts in this pull request have been resolved.
• All relevant type-of-change labels have been added.
• All relevant repo and/or project documentation has been updated to reflect the changes in this PR.
• All new and existing tests pass.
• Bump major, minor, patch, pre-release, and/or build versions as appropriate via the bump_version script if this repository is versioned and the changes in this PR warrant a version bump.
• Verify that the new AMI functions as expected in our dev-a COOL deployment.
• Create a pre-release (necessary if and only if the pre-release version was bumped).
• Verify that the pre-release functions as expected in our staging-a COOL deployment.

✅ Pre-merge checklist

• Finalize version.

✅ Post-merge checklist

• Create a release (necessary if and only if the version was bumped).

For more information:

🛠 Lineage configurations for this project are stored in .github/lineage.yml

📚 Read more about Lineage