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

Add hint of Issue #478 to error text #2085

Merged
merged 1 commit into from
Nov 26, 2016

Conversation

DuncanBetts
Copy link
Contributor

  • [ master ] Target: for bug or doc fixes, target master; for new features, target features;

Tried to resolve 3 way merge (with help) but it kept recurring, subsequently accidentally closed previous pull request in process of trying to resolve.

Same as Pull #2081

@decentral1se
Copy link
Contributor

🚀

@coveralls
Copy link

Coverage Status

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

@nicoddemus
Copy link
Member

Will merge as soon as #2092 passes.

@nicoddemus nicoddemus merged commit d05d19d into pytest-dev:master Nov 26, 2016
@nicoddemus
Copy link
Member

Thanks again @DuncanBetts!

@enkore
Copy link

enkore commented Nov 26, 2016

Tried to resolve 3 way merge (with help) but it kept recurring

The ways of git sometimes escape even the most experienced developers :)

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.

5 participants