8000 fix doc typo by lodagro · Pull Request #967 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

fix doc typo #967

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 1 commit into from
Closed

fix doc typo #967

wants to merge 1 commit into from

Conversation

lodagro
Copy link
Contributor
@lodagro lodagro commented Jun 28, 2012

While reading "Our Favorite Recipes" i noticed a little typo. This pull request corrects it.

@pelson
Copy link
Member
pelson commented Jun 28, 2012

Thanks @lodagro these changes are helpful. If you don't mind, would you be able to either re-base these changes against the v1.1.x branch, or alternatively open a completely new PR with these changes applied to a v1.1.x branch?

@lodagro
Copy link
Contributor Author
lodagro commented Jun 28, 2012

I created a new branch starting from the v1.1.x branch, applied the little change and prepared a new pull request. But this one stated that 'to be merged on matplotlib:master'. But this is not what`s needed, it should be on v1.1.x right?
(I did not complete the new pull request)

On the other hand if i would rebase to v.1.1.x, this would give a conflict if i would pull from upstream/v.1.1.x (if pull request is merged in)?

@pelson
Copy link
Member
pelson commented Jun 28, 2012

But this one stated that 'to be merged on matplotlib:master'.

That's odd. Normally github is good at this kind of thing. You can change the branch that the PR is intended to merge into when creating it, but obviously it should pretty much always be against the branch that you originally branched from.

To rebase your branch, something along the lines of:

BRANCH_NAME=doc
git co $BRANCH_NAME
git fetch upstream
git rebase upstream/v1.1.x
git push -f origin $BRANCH_NAME

As you said, this will mean that the origin will need to be fast-forwarded (as its commit history will have been modified), but since you are the only user of this branch, that isn't such a big deal.

@lodagro
Copy link
Contributor Author
lodagro commented Jun 28, 2012

This gave merge conflicts. I`ll close this one and try again starting with branching from v1.1.x iso master.

First, rewinding head to replay your work on top of it...
Applying: C/C++ compiling (not necessarily working) with Py3K
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging lib/matplo
8623
tlib/__init__.py
Auto-merging lib/matplotlib/backends/backend_ps.py
Auto-merging lib/matplotlib/cbook.py
CONFLICT (content): Merge conflict in lib/matplotlib/cbook.py
Auto-merging setup.py
Auto-merging setupext.py
Auto-merging src/_backend_agg.cpp
CONFLICT (content): Merge conflict in src/_backend_agg.cpp
Auto-merging src/_image.cpp
Auto-merging src/_path.cpp
CONFLICT (content): Merge conflict in src/_path.cpp
Auto-merging src/_png.cpp
Auto-merging src/cntr.c
Auto-merging src/ft2font.cpp
CONFLICT (content): Merge conflict in src/ft2font.cpp
Auto-merging src/nxutils.c
Failed to merge in the changes.
Patch failed at 0001 C/C++ compiling (not necessarily working) with Py3K

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

@lodagro lodagro closed this Jun 28, 2012
@lodagro lodagro mentioned this pull request Jun 28, 2012
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@lodagro @pelson
0