Closed cisagovbot closed 8 months ago
Totals | |
---|---|
Change from base Build 7183864213: | 0.0% |
Covered Lines: | 0 |
Relevant Lines: | 0 |
I had already resolved the conflicts and this PR was just awaiting review. @schmelz21, why did you close it?
@jsf9k, that was my misunderstanding then. I went through the conflict resolution steps and believe an auto-merge / delete pr occured. I will stay away from the future lineage PRs when they come in. I can see the file changes now in this PR. https://github.com/cisagov/tpt-reports/pull/80
See #80, which was created by Lineage after this PR was closed.
@jsf9k, that was my misunderstanding then. I went through the conflict resolution steps and believe an auto-merge / delete pr occured. I will stay away from the future lineage PRs when they come in. I can see the file changes now in this PR. #80
No problem. I just thought that maybe it was intentional and I was missing something.
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
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: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.
Wait for all the automated tests to pass.
Confirm each item in the "Pre-approval checklist" below.
Remove any of the checklist items that do not apply.
Ensure every remaining checkbox has been checked.
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!
✅ Pre-merge checklist
Remove any of the following that do not apply. These boxes should remain unchecked until the pull request has been approved.
bump_version.sh
script if this repository is versioned and the changes in this PR warrant a version bump.✅ Post-merge checklist
Remove any of the following that do not apply.
For more information:
🛠 Lineage configurations for this project are stored in
.github/lineage.yml
📚 Read more about Lineage