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

Added a screenshot of the link for the Read the Docs preview #1298

Merged

Conversation

haman80
Copy link
Contributor

@haman80 haman80 commented Oct 6, 2021

…ocumentation for a pull request

  • I have added a changelog entry for this pull request.
  • If adding new functionality, I have added tests and
    docstrings.
  • I have fixed any newly failing tests.

@github-actions github-actions bot added the docs PlasmaPy Docs at http://docs.plasmapy.org label Oct 6, 2021
@haman80
Copy link
Contributor Author

haman80 commented Oct 6, 2021

pre-commit.ci autofix

@namurphy
Copy link
Member

namurphy commented Oct 6, 2021

@haman80 — many thanks for making this change! The problem with the pre-commit.ci check is that another pull request that was just merged (#1263) altered the lines immediately next to the ones you're adding here...in particular adding :guilabel: twice.

If you go to "resolve conflicts" on this page above the checks, there will be something like....

<<<<<<< 
   your changes here...
=======
  what's currently in plasmapy/main...
>>>>>>> 

The next step would be to combine the two sections of code, which would be moving the changes from the bottom into the corresponding sentence in your changes, and then deleting the <<<, === and >>> lines. You might need to run pre-commit.ci autofix once more after that.

Anyway, sorry about that! I had meant to avoid that part of the code but forgot about the changes in #1263.

@haman80
Copy link
Contributor Author

haman80 commented Oct 7, 2021

pre-commit.ci autofix

@codecov
Copy link

codecov bot commented Oct 7, 2021

Codecov Report

Merging #1298 (e34a4db) into main (d28c7c5) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #1298   +/-   ##
=======================================
  Coverage   97.09%   97.09%           
=======================================
  Files          73       73           
  Lines        7170     7170           
=======================================
  Hits         6962     6962           
  Misses        208      208           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d28c7c5...e34a4db. Read the comment docs.

@haman80 haman80 marked this pull request as ready for review October 7, 2021 00:31
@namurphy namurphy merged commit 7b4e4aa into PlasmaPy:main Oct 7, 2021
@haman80 haman80 deleted the adding-readthedoc-preview-screenshot branch October 7, 2021 21:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs PlasmaPy Docs at http://docs.plasmapy.org no changelog entry needed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants