Closed cisagovbot closed 3 years ago
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
https://github.com/cisagov/skeleton-ansible-role.git
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!
lineage/skeleton
Take ownership of this pull request by removing any other assignees.
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 checkout -b lineage/skeleton --track origin/develop git pull skeleton HEAD git status
Review the changes displayed by the status command. Fix any conflicts and possibly incorrect auto-merges.
status
After resolving each of the conflicts, add your changes to the branch, commit, and push your changes:
add
commit
push
git add .github/CODEOWNERS .gitignore git commit --message="Resolve Lineage conflicts." git push --force --set-upstream origin lineage/skeleton
Wait for all the automated tests to pass.
Check the "Everything is cool" checkbox below:
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
.github/lineage.yml
📚 Read more about Lineage
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
Take ownership of this pull request by removing any other assignees.
Clone the repository locally, and reapply the merge:
Review the changes displayed by the
status
command. Fix any conflicts and possibly incorrect auto-merges.After resolving each of the conflicts,
add
your changes to the branch,commit
, andpush
your changes:Wait for all the automated tests to pass.
Check the "Everything is cool" checkbox below:
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