Skip to content
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

CHANGELOG whats_new.rst / Re-generate simple auto legend #3043

Closed
wants to merge 3 commits into from
Closed

CHANGELOG whats_new.rst / Re-generate simple auto legend #3043

wants to merge 3 commits into from

Conversation

anykraus
Copy link
Contributor

@anykraus anykraus commented May 6, 2014

Updated CHANGELOG and whats_new.rst: with (re-)generate auto-legend in Qt4Agg backend.
#2947 (comment)

(Fix of Issue #2934)

@tacaswell
Copy link
Member

Good catch! Sorry I merged that without waiting for the documentation. Could you squash all of these down into one commit?

@tacaswell tacaswell added this to the v1.4.0 milestone May 6, 2014
@anykraus
Copy link
Contributor Author

anykraus commented May 6, 2014

Should I squash just the two commits of changelog and whats_new.rst into one, or more?
I edited those files through the github.com webinterface, this immediately creates a commit as soon as I edit a single file. Can I do something (like changing two files simultaneously) through the webinterface, or is it time to switch to a real git client?

@tacaswell
Copy link
Member

Interesting.

I think it is time to switch to a real git client ;)

The merge from master should also go away.

@anykraus
Copy link
Contributor Author

anykraus commented May 7, 2014

Okay, I got a bit lost about how git works...(how to get rid of this merge from master...)
So I ended up deleting my matplotlib fork from github, forked it again on gitbub, started a new branch with the updated documentation from my local git client.
Hopefully now everything is fine.
Please see new Pull Request #3047

A question a side:
Is the method described in https://help.github.com/articles/syncing-a-fork
the easiest way to keep my fork in sync with original matplotlib repository? Would this method create these "merge from master" commits?

@tacaswell
Copy link
Member

That is a rather extreme solution. git rebase + git push github --force would have done most of what you needed.

You should never commit onto the master branch on your local copy, you should only add commits to it via the method at that link. I suspect that your other PR was from your master branch which generated a merge commit when you merged up-stream master back into your master.

git is one of those things that is confusing and makes no sense until suddenly it will all make sense and you think it is the best thing ever ;)

@tacaswell tacaswell closed this May 7, 2014
@anykraus
Copy link
Contributor Author

anykraus commented May 7, 2014

So, (g)it is very similar to quantum mechanics. :)

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

Successfully merging this pull request may close these issues.

None yet

3 participants