Skip to content

Fixed bad merge #19932

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 1 commit into from
Closed

Fixed bad merge #19932

wants to merge 1 commit into from

Conversation

GrahamCampbell
Copy link
Contributor

Q A
Branch? 3.1
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
License MIT

@GrahamCampbell GrahamCampbell mentioned this pull request Sep 13, 2016
Closed
@GrahamCampbell
Copy link
Contributor Author

I did actually flag this as a point to be careful with when merging in #19813 (comment). :trollface: :P

@GrahamCampbell
Copy link
Contributor Author

I guess maybe 2.8 is the place to fix this rather than 3.1. :)

@fabpot
Copy link
Member

fabpot commented Sep 13, 2016

Thank you @GrahamCampbell.

fabpot added a commit that referenced this pull request Sep 13, 2016
@fabpot
bug #19932 Fixed bad merge (GrahamCampbell)
0c927d7 
This PR was submitted for the 3.1 branch but it was merged into the 2.8 branch instead (closes #19932).

Discussion
----------

Fixed bad merge

| Q             | A
| ------------- | ---
| Branch?       | 3.1
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

Commits
-------

d30374d Fixed bad merge
@fabpot fabpot closed this Sep 13, 2016
This was referenced Oct 3, 2016
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Bug Status: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@GrahamCampbell @fabpot @carsonbot