search

cisagov / ansible-role-guacamole

An Ansible role for installing cisagov/guacamole-composition
Creative Commons Zero v1.0 Universal
4 stars 3 forks source link

⚠️ CONFLICT! Lineage pull request for: skeleton #75

Closed cisagovbot closed 4 weeks ago

cisagovbot commented 1 month ago

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-ansible-role.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/ansible-role-guacamole.git ansible-role-guacamole
cd ansible-role-guacamole
git remote add skeleton https://github.com/cisagov/skeleton-ansible-role.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/dependabot.yml .github/workflows/build.yml .pre-commit-config.yaml meta/main.yml molecule/default/molecule.yml molecule/default/requirements.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!

[!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

dv4harr10 commented 4 weeks ago

Hi Shane @jsf9k , when I goto linage/skeleton/.github/dependabot.yml I am getting an error message 'Cannot configure Dependabot, to configure Dependabot you must use this repository's default branch.' Please advise.

jsf9k commented 4 weeks ago

Hi Shane @jsf9k , when I goto linage/skeleton/.github/dependabot.yml I am getting an error message 'Cannot configure Dependabot, to configure Dependabot you must use this repository's default branch.' Please advise.

That is because you are viewing the Dependabot configuration file in a non-default branch (lineage/skeleton). You should be able to review the changes from the "Files changed" tab just above the PR description.