The failures are not related. The 2.6 ones are fixed by #3661 and the other one is a random one.

👍 If we rebase on master and give Travis another go...

Sorry, I merged #3661 which apparently conflicts with this..

Does that mean I need to merge matplotlib/master into my branch to get Travis to rerun?

Not that it is so important but it must be #3635 that conflicts with this one.

We prefer that you do a re-base rather than merge master into your branch. This is done via

cd your/mpl/checkout
git remote update
git checkout your_branch
git rebase upstream/master

and follow the on-screen directions. 'upstream' is what ever name you have given to the 'matplotlbi/matplotlib' repository.

The conflicts are in example/units/evans_test.py

@jenshnielsen That makes more sense.

sorry, forgot the last step, after you have cleaned up the conflicts and merged everything

git push --force your_repo classes_new_style:classes_new_style

I had to

• resolve the change
• git add
• git rebase --continue
• resolve the same change
• git add
• git rebase --continue

And then it told me, can't --continue, there's nothing to resolve, so I did

• git rebase --skip
• git push --force origin classes_new_style:classes_new_style

The two changed lines that git considered in conflict because they were adjacent, are now both in their changed (better) states in switham/matplotlib.

Maybe the weird middle part was because I had done a git commit --amend before the original pull request, so I had to re-merge the two duplicate commits again. I saved a screen log in case anyone's interested.

Also, I don't see github proceeding to run Travis after I did this:
$ git push --force origin classes_new_style:classes_new_style
Counting objects: 338, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (158/158), done.
Writing objects: 100% (196/196), 18.29 KiB, done.
Total 196 (delta 183), reused 49 (delta 38)
To https://github.com/switham/matplotlib.git
+ e0a9377...f4e9c6c classes_new_style -> classes_new_style (forced update)
$

(This has been edited, I mistakenly wrote "git commit --continue" instead of "git rebase --continue" before. Another edit later.)

@switham Thanks! Is this your first contribution to mpl?

This one and #3628 are my first two, yay!