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

Convert README & CONTRIBUTING from rst to md #1633

Merged
merged 1 commit into from
Oct 26, 2021

Conversation

davidylee
Copy link
Contributor

Pull Request check-list

Please make sure to review and check all of these items:

  • Does $ tox pass with this change (including linting)?
  • Do the CI tests pass with this change (enable it first in your forked repo and wait for the github action build to finish)?
  • Is the new or changed code fully tested?
  • Is a documentation update included (if this change modifies existing APIs, or introduces new ones)?

NOTE: these things are not required to open a PR and can be done
afterwards / while the PR is open.

Description of change

Resolves #1631
Convert README & CONTRIBUTING from rst to md

@chayim
Copy link
Contributor

chayim commented Oct 21, 2021

@davidylee Amazing contribution thank you so much! There's a conflict that I can't resolve - which involved merging in CONTRIBUTING.rst and updating your branch. Can you take a look?

Curious - did you run pandoc against this or do something else?

@chayim chayim added the maintenance Maintenance (CI, Releases, etc) label Oct 21, 2021
@davidylee
Copy link
Contributor Author

Hi @chayim -- I believe I have pushed resolving changes. And yes, utilized pandoc!

Would you be able to add a hacktoberfest-accepted label ? I'm trying to get qualifying PRs.

@chayim
Copy link
Contributor

chayim commented Oct 21, 2021

@davidylee Hmmm.. still conflicting on your side. Mind having another go. Label applied thanks!

Heck, if you're really game we'd love contributions, docs.... well help in general!

@davidylee davidylee force-pushed the convert-readme branch 2 times, most recently from 9986cb3 to 009d63b Compare October 21, 2021 18:14
@davidylee
Copy link
Contributor Author

I think it should be good now. If not, I'm not quite sure how to see what's going on, could you guide me how?

@chayim
Copy link
Contributor

chayim commented Oct 25, 2021

Hi @davidylee I took a look locally. So, the issue is that there are changes to the CONTRIBUTING.rst file since this change. My advice is to branch (again) off of the current master, and then do the conversions and submit. I'm sorry about the pain - it's a branch timing+changes issue. Sorry about this!

@davidylee
Copy link
Contributor Author

Sure @chayim , done.. hope it worked..

@chayim
Copy link
Contributor

chayim commented Oct 25, 2021

Ah - I think I see it. Your local fork of master is out of date. Update your master, merge your master into your branch, then update this PR and I think we're okay. I don't really know what's happening on your end.

Thanks for working through this!

@davidylee
Copy link
Contributor Author

@chayim Thanks so much for your patience with me, I finally fixed it..!

@chayim
Copy link
Contributor

chayim commented Oct 26, 2021

All good @davidylee thank you so much for working this through. Glad to have this in the release we're about to make!

@chayim chayim merged commit 70ef9ec into redis:master Oct 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hacktoberfest-accepted maintenance Maintenance (CI, Releases, etc)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Convert README from restructured text to markdown
2 participants