-
-
Notifications
You must be signed in to change notification settings - Fork 2.7k
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
Add hint of Issue #478 to error text #2081
Conversation
Congrats on your first PR! 🎈 The fix looks good! Could you also add yourself to Thanks! |
@@ -11,7 +11,7 @@ | |||
* Cope gracefully with a .pyc file with no matching .py file (`#2038`_). Thanks | |||
`@nedbat`_. | |||
|
|||
* | |||
* Add hint to error message hinting possible missing __init__.py (`#478`_). Thanks `@DuncanBetts`_. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You need to add the actual link to your user, see the lines below for @nedbad_
:
.. _@DuncanBetts: https://github.com/DuncanBetts
(Add it before nedbat's to keep the list sorted)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok. Am about to eat so will do tomorrow now. Thanks :).
I committed the AUTHORS and CHANGELOG in a separate commit, and then ran interactive rebase and fixed up/squashed the new commit into the old commit, which has changed the SHA I believe. When I tried to push I was behind HEAD, pull resulted in a 3 way merge. I think I did the right thing? |
Yes no problem. If you want to avoid the merge, use |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lovely, we can merge after the text fixup 👍
I followed your advice @nicoddemus, it still triggered a fresh three way merge and there's an extra line in the CHANGELOG as a result. |
Hmm that's strange, it should have applied cleanly. Here are the steps in case they were not clear from my previous explanation:
If you get a conflict somewhere, fix the conflict by following the instructions from git. (Sorry if I'm stating the obvious, I don't know your level of expertise on git 😁 ) |
[ master ] Target: for bug or doc fixes, target
master
; for new features, targetfeatures
;[ Not Done Yet ] Add yourself to
AUTHORS
[ Not Done Yet ] Add a new entry to
CHANGELOG.rst
RST Formatted, as requested:
Issue 478 <https://github.com/pytest-dev/pytest/issues/478>
[Issue 478] (#478)
I have implemented enkore's suggestion.
Feedback, suggestions, and rejection, all welcome! This is my first pull request 🎉.
Thanks @DuncanBetts for the PR (https://github.com/DuncanBetts).