Skip to content

fix #3631 - don't store legacy markinfo when its impossible #3637

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

Merged
merged 1 commit into from
Jun 30, 2018

Conversation

RonnyPfannschmidt
Copy link
Member

.

@RonnyPfannschmidt
Copy link
Member Author

@nicoddemus perhaps a candidate to rebase onto master?

@coveralls
Copy link

coveralls commented Jun 29, 2018

Coverage Status

Coverage increased (+0.05%) to 92.65% when pulling 5bd5b8c on RonnyPfannschmidt:fix-3631 into a48c47b on pytest-dev:master.

@nicoddemus
Copy link
Member

perhaps a candidate to rebase onto master?

You mean cherry-pick this commit into master? Why not targeting master directly?

@RonnyPfannschmidt
Copy link
Member Author

i simply first based it on features and by rebase i mean rebase form features onto master

@nicoddemus
Copy link
Member

i simply first based it on features and by rebase i mean rebase form features onto master

You want to rebase features onto master, but merge this branch in features still? Or you intend to merge this into master?

I think this is a bug fix and can go directly to master (this is what you might have been meaning since the beginning, I apologize for not getting it right away).

@RonnyPfannschmidt
Copy link
Member Author

rebase onto master = take away from features and put onto master

will do

@RonnyPfannschmidt RonnyPfannschmidt changed the base branch from features to master June 29, 2018 12:01
@RonnyPfannschmidt
Copy link
Member Author

git rebase features --onto master is surprisingly painless by now ^^

Copy link
Member

@nicoddemus nicoddemus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice 👍

@nicoddemus nicoddemus merged commit 2b75a31 into pytest-dev:master Jun 30, 2018
@RonnyPfannschmidt RonnyPfannschmidt deleted the fix-3631 branch July 1, 2018 09:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants