Skip to content
This repository was archived by the owner on Dec 1, 2022. It is now read-only.

Conversation

felddy
Copy link
Contributor

@felddy felddy commented May 12, 2020

Lineage Pull Request: CONFLICT

DANGER

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

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. Clone the lineage/skeleton branch locally:

    git clone --single-branch --branch lineage/skeleton git@github.com:cisagov/skeleton-aws-lambda.git
  2. Review each of the following files looking for conflict-resolution markers:

    .github/lineage.yml
  3. Resolve each of the conflicts and add your changes to the branch:

    git add .github/lineage.yml 
  4. Once all the changes have been added, commit and push the changes back to
    GitHub:

    git commit --message="Resolved Lineage conflicts."
    git push
  5. Wait for all the automated tests to pass.

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

    • ✌️ 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

@felddy felddy closed this May 12, 2020
@felddy felddy deleted the lineage/skeleton branch May 12, 2020 22:03
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant