BUG: enabling subplots works unexpectedly by sinhrks · Pull Request #6951 · pandas-dev/pandas (original) (raw)

@jreback this is OK, just a conflict in release.rst

Can I merge this from the command line with

git checkout -b sinhrks-scattersp2 master
git pull git://github.com/sinhrks/pandas.git scattersp2

fixing the conflict in release.rst, rebasing onto master, checking out master and merging this PR in, and pushing to upstream/master? I shouldn't force push to master right?