Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 13 commits into from
Jun 3, 2021
Merged

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

merged 13 commits into from
Jun 3, 2021

Conversation

cisagovbot
Copy link

@cisagovbot cisagovbot commented Jun 2, 2021 •
edited by mcdonnnj
Loading

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-generic.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 [email protected]:cisagov/skeleton-docker.git skeleton-docker
cd skeleton-docker
git remote add skeleton https://github.com/cisagov/skeleton-generic.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 .pre-commit-config.yaml 
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. 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 and others added 6 commits April 12, 2021 10:37
@felddy
Improve gitignore file comments and organization.
ba49077 
* Add a comment describing what the files does.
* Add sections to organize patterns.
@mcdonnnj
Remove user from CODEOWNERS
2c4d7a2 
Due to her departure this removes hillaryj from the default CODEOWNERS we use
in our projects.
@mcdonnnj
Update pre-commit hooks
0349499 
Hooks updated with the `pre-commit autoupdate` command.

Note:
The `ansible-lint` hook is intentionally being held back on 4.3.7 because of
ongoing issues with the 5.x version and how we use Ansible (standalone Galaxy
roles).
@mcdonnnj
Update configuration instructions for pyenv
23b324b 
With the release of pyenv v2.0.0 there is a breaking change around startup
logic that necessitates an update for our pyenv setup instructions. Also
add a statement about how to get configuration instructions from pyenv
itself.
@mcdonnnj
Merge pull request #71 from cisagov/maintenance/update_pre-commit_hooks
bd12db1 
Update pre-commit Hooks
@mcdonnnj
Merge branch 'develop' into maintenance/remove_user_from_codeowners
39a67fc
@cisagovbot cisagovbot added the upstream update This issue or pull request pulls in upstream updates label Jun 2, 2021
mcdonnnj added 3 commits June 2, 2021 10:56
@mcdonnnj
Merge pull request #70 from cisagov/improvement/gitignore_me
b0e7f01 
Improve gitignore file comments and organization.
@mcdonnnj
Merge github.com:cisagov/skeleton-generic into lineage/skeleton
f250f01
@mcdonnnj
Add Docker section to the gitignore file
8c51707 
Mirror changes in cisagov/skeleton-generic by adding a Docker section to the
gitignore file and moving appropriate entries to that section.
@mcdonnnj mcdonnnj force-pushed the lineage/skeleton branch from 4a83d42 to 8c51707 Compare June 2, 2021 19:22
@mcdonnnj mcdonnnj marked this pull request as ready for review June 2, 2021 19:45
dav3r
dav3r approved these changes Jun 2, 2021
View reviewed changes
Copy link
Member

@dav3r dav3r left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔩

@mcdonnnj mcdonnnj merged commit ed8cff9 into develop Jun 3, 2021
@mcdonnnj mcdonnnj deleted the lineage/skeleton branch June 3, 2021 15:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dav3r dav3r dav3r approved these changes

@jsf9k jsf9k jsf9k approved these changes

@felddy felddy Awaiting requested review from felddy felddy is a code owner

@hillaryj hillaryj Awaiting requested review from hillaryj

@mcdonnnj mcdonnnj Awaiting requested review from mcdonnnj mcdonnnj is a code owner

Assignees

@mcdonnnj mcdonnnj

Labels
upstream update This issue or pull request pulls in upstream updates
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@cisagovbot @jsf9k @dav3r @felddy @hillaryj @mcdonnnj