⚠️ CONFLICT! Lineage pull request for: skeleton

[cisagovbot]

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.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/cyhy_amis.git cyhy_amis
   cd cyhy_amis
   git remote add skeleton https://github.com/cisagov/skeleton-generic.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 .github/labeler.yml 
   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

Remove any of the following that do not apply. If you're unsure about any of these, don't hesitate to ask. We're here to help!

• ✌️ The conflicts in this pull request have been resolved.
• All relevant type-of-change labels have been added.
• All new and existing tests pass.

---

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

[Copilot]

Pull Request Overview

This is a lineage pull request that incorporates upstream changes from the skeleton-generic repository, specifically adding Docker label support and improving configuration comments. The PR had merge conflicts that have been resolved.

• Added Docker label configuration to support Docker-related pull requests
• Enhanced labeler configuration with clarifying comments for different technology stacks
• Resolved merge conflicts as indicated by the "CONFLICT!" title

Reviewed Changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File	Description
.github/labels.yml	Added new Docker label definition for Docker-related pull requests
.github/labeler.yml	Added Docker labeler configuration (commented out) and clarifying comments for technology stack sections

---

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

[jsf9k]

Do you need to update the version tags for cisagov/setup-env-github-action, actions/setup-python, and actions/checkout here? Aren't those part of the upstream changes?

[mcdonnnj]

Do you need to update the version tags for cisagov/setup-env-github-action, actions/setup-python, and actions/checkout here? Aren't those part of the upstream changes?

Since this descends directly from cisagov/skeleton-generic those changes were already merged during the last top-level wave in #896.