Do you feel comfortable squashing the commits to avoid adding and removing the changelog file?

Other than that, just a bit of clean up of the changelog file left

Thanks for the feedback, I'll try to figure it out. This is my first time and I'm not familiar with squashing, but I'll try.

We have some docs on squashing viagit rebase -i:

https://matplotlib.org/stable/devel/development_workflow.html#rewrite-commit-history

Also remove from the corresponding.pyi file, please

We have some docs on squashing viagit rebase -i:

https://matplotlib.org/stable/devel/development_workflow.html#rewrite-commit-history

Thanks, I think I figured it out.

It shows one test failing Mypy. I'm having trouble understanding what the issue is, any suggestions on what I need to do to correct?

I agree the Mypy message could be clearer, but Ithink it’s just that you have removed some methods from the.py file that you have not yet removed from the.pyi file.

stubtest is still complaining; the entries corresponding to the removed ones need to be removed from the.pyi file as well. You can see its comments on theFiles changed tab.

I'm completely lost at this point. I don't understand where all the problems are coming from.

You seem to have done the (roughly) same thing you did previously regarding rebasing.

If you only have the last commit, it looks correct (though I would want CI to run to be sure).

One issue is that main has also updated theinheritance-diagram that you had to update, which is causing a conflict.

Unfortunately that is one big long line that makes it hard to tell what the differences are:

It was edited in#26874, which removed theBrokenBarHCollection, so both that andCLabelText should be removed.

The following should resolve it:

git rebase --onto upstream/main HEAD~1# Resolve the conflict noted above, leaving that line in once, the git `>>>>`/`====`/`<<<<` lines removed, etc and both entries to be removed left out$EDITOR doc/api/artist_api.rstgit add doc/api/artist_api.rstgit rebase --continue# Edit commit messagegit push --force-with-lease

If you'd rather we do it, I'm willing, but that is what I believe is needed.

e is that main has also updated the

Thanks, I'll give it one more try. Thanks for the patience.

@DHClimber it appears something messed up here, as you have only a single newline added to one file now. I think the correct commit isf448c0f. You can re-fetch that with (assuming you have theupstream remote as we recommend):

$ git fetch upstream f448c0fc73a624edf46806db961392518b365358:original-depreciated

Then you can reset your branch to it:

$ git checkout depreciated$ git reset --hard original-depreciated

and push to replace it here:

$ git push --force-with-lease origin depreciated

@DHClimber it appears something messed up here, as you have only a single newline added to one file now. I think the correct commit isf448c0f. You can re-fetch that with (assuming you have theupstream remote as we recommend):

$ git fetch upstream f448c0fc73a624edf46806db961392518b365358:original-depreciated

Then you can reset your branch to it:

$ git checkout depreciated$ git reset --hard original-depreciated

and push to replace it here:

$ git push --force-with-lease origin depreciated

Thank you, I have been out of town traveling. I'll try to fix now.

It seems like correct commit now, but I'm confused what is causing automated tests to fail. If anyone can provide a hint I'm happy to try and correct it.

It looks like you have some conflicts - it may be that something didn't go right on your rebase. Could you try checking again? Here's relevant documentation, hope it helps:https://matplotlib.org/devdocs/devel/development_workflow.html#manage-commit-history

If you need extra help let us know.

It looks like you have some conflicts - it may be that something didn't go right on your rebase. Could you try checking again? Here's relevant documentation, hope it helps:https://matplotlib.org/devdocs/devel/development_workflow.html#manage-commit-history

If you need extra help let us know.

Sorry, I've tried everything I can think of but nothing is making sense. I can't understand where the conflicts are coming from, I'm just shooting in the dark now.

artist_api.rst error is complaining my branch doesn't match "main", but I don't understand why that is an error when the file needed to be updated?

I think I should have cleaned that up, I actually had a branch from the first time I advised a rebase sitting on one of my machines that I had taken care of the conflicts on, so I just rebased that again and pushed it up

I think I should have cleaned that up, I actually had a branch from the first time I advised a rebase sitting on one of my machines that I had taken care of the conflicts on, so I just rebased that again and pushed it up

Thanks! I was so confused, didn't even know that was a possibility.

Can you update the commit message? It currently is an incomplete statement: 'removal of deprecated'. It would be better if it matched this PR title, for example.

Can you update the commit message? It currently is an incomplete statement: 'removal of deprecated'. It would be better if it matched this PR title, for example.

Sorry about that, should be corrected now.

Just following up, is there anything else that needs to be done here?

We require two approvals before merges, so this is waiting for a second reviewer.