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.

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

Remove line regarding moving the catalog into the repository from the README #3241

Closed
wants to merge 0 commits into from

Conversation

AlajeBash
Copy link
Contributor

Fixes

Fixes #3202 by @AetherUnbound

Description

Remove line regarding moving the catalog into the repository from the README.MD file.

Testing Instructions

Checklist

  • My pull request has a descriptive title (not a vague title likeUpdate index.md).
  • My pull request targets the default branch of the repository (main) or a parent feature branch.
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • I added or updated tests for the changes I made (if applicable).
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no visible errors.
  • I ran the DAG documentation generator (if applicable).

Developer Certificate of Origin

Developer Certificate of Origin
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

@AlajeBash AlajeBash requested a review from a team as a code owner October 23, 2023 14:06
@AlajeBash AlajeBash requested review from krysal and obulat October 23, 2023 14:06
@openverse-bot openverse-bot added 🟩 priority: low Low priority and doesn't need to be rushed 🛠 goal: fix Bug fix 📄 aspect: text Concerns the textual material in the repository 🧱 stack: documentation Related to Sphinx documentation labels Oct 23, 2023
@dhruvkb
Copy link
Member

dhruvkb commented Oct 23, 2023

@AlajeBash here we see why @obulat mentioned that making PRs from main is not recommended. Now the history of this PR contains all the old commits from your last PR.

Here's how we can fix this.

  1. This will reset main to a pristine condition, exactly how it in on WordPress/openverse.

    $ git checkout main
    $ git fetch upstream main
    $ git reset --hard upstream/main
  2. Then we create a new branch specifically for the issue we're solving.

    $ git checkout -b 3202_update_readme
    $ <make changes and commit>
    $ git push origin 3202_update_readme
  3. Finally we make a PR from your repo's 3202_update_readme to our repo's main branch.

  4. Once the PR is merged, you can delete 3202_update_readme in your repo and checkout a new branch for the next issue, by repeating step 1.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
📄 aspect: text Concerns the textual material in the repository 🛠 goal: fix Bug fix 🟩 priority: low Low priority and doesn't need to be rushed 🧱 stack: documentation Related to Sphinx documentation
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Remove line regarding moving the catalog into the repository from the README
3 participants