⚠️ 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-python-library.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/gophish-tools.git gophish-tools
   cd gophish-tools
   git remote add skeleton https://github.com/cisagov/skeleton-python-library.git
   git remote set-url --push skeleton no_push
   git switch develop
   git checkout -b 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 src/assessment/__main__.py src/example/example.py tests/test_example.py 
   git commit --message="Resolve Lineage conflicts."
   git push --force --set-upstream origin lineage/skeleton

5. Wait for all the automated tests to pass.

6. Check the "Everything is cool" checkbox below:

   • [x] ✌️ The conflicts in this pull request have been resolved.

7. 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

[lgtm-com[bot]]

This pull request introduces 1 alert when merging 4336e057b2adc40208d6f66c6cba7ae7e037aae6 into 5cbb7c1ad450dd1652e17dd8493cf4cfff118fe1 - view on LGTM.com

new alerts:

• 1 for Syntax error

[lgtm-com[bot]]

This pull request introduces 1 alert when merging b880db9fa5c7eedec1bc5fdd7fdbdd34b8ef0daf into 5cbb7c1ad450dd1652e17dd8493cf4cfff118fe1 - view on LGTM.com

new alerts:

• 1 for Syntax error

[dav3r]

Accidentally closed this- reopening.