Skip to content

Fix issue with merge-pr.py script #12083

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

Closed
wants to merge 2 commits into from

Conversation

wesm
Copy link
Member

@wesm wesm commented Jan 18, 2016

The commented line shown produces an error on fresh clones of pandas, and is not needed AFAICT.

@jreback
Copy link
Contributor

jreback commented Jan 19, 2016

this gave me an error after it pushed the merged branch to master

it said: Would you like to pick %s into another branch?

and I said Y, at which point latest_branch was undefined. Not really even sure what that's supposed to do. I presume it would have cherry-picked to my local copy of master, as the remote master was already updated.

The script exited and all was ok.

What is the purpose of that section?

@jreback jreback added the Build Library building on various platforms label Jan 19, 2016
@jreback jreback added this to the 0.18.0 milestone Jan 19, 2016
@wesm
Copy link
Member Author

wesm commented Jan 19, 2016

You say no to that. We can also remove that section

@wesm
Copy link
Member Author

wesm commented Jan 19, 2016

@jreback I removed the cruft. If looks good merge away. If we find ourselves doing much backporting to maintenance branches in the future we can add some tools for that

@jreback jreback closed this in 2450306 Jan 19, 2016
@jreback
Copy link
Contributor

jreback commented Jan 19, 2016

merged. thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Build Library building on various platforms
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants