Coverage decreased (-0.0008%) to 92.817% when pulling ba3c1d2 on DuncanBetts:master into 38f7562 on pytest-dev:master.

This is my first pull request 🎉

Congrats on your first PR! 🎈

The fix looks good! Could you also add yourself to AUTHORS and a new CHANGELOG entry?

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?

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 git fetch and git rebase upstream/master first so you will rebase on the most up-to-date version of the repository (assuming you added pytest-dev/pytest as a remote named upstream). Then you should be able to git push cleanly.

Coverage decreased (-0.0008%) to 92.817% when pulling f05bc4f on DuncanBetts:master into 38f7562 on pytest-dev:master.

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.
Most likely because in an effort to keep this to a single commit, I used commit --amend.
Will try and fix now.

Hmm that's strange, it should have applied cleanly. Here are the steps in case they were not clear from my previous explanation:

1. Add the official repository as upstream:

$ git remote add upstream https://github.com/pytest-dev/pytest

2. Follow this steps to rebase:

$ git fetch --all
$ git rebase upstream/master

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 😁 )

Coverage decreased (-0.0008%) to 92.819% when pulling 438911f on DuncanBetts:master into 33796c8 on pytest-dev:master.