Skip to content

For 2.0: Fix links in Notebook Help Menu#5476

Merged
minrk merged 3 commits into
ipython:masterfrom
ellisonbg:helplinks
Apr 1, 2014
Merged

For 2.0: Fix links in Notebook Help Menu#5476
minrk merged 3 commits into
ipython:masterfrom
ellisonbg:helplinks

Conversation

@ellisonbg
Copy link
Copy Markdown
Member

We need to update some of the links in the Help Menu before 2.0. This does that, but the links won't work until after #5337 is merged.

@ellisonbg ellisonbg modified the milestones: 2.0, ht Mar 31, 2014
@minrk
Copy link
Copy Markdown
Member

minrk commented Mar 31, 2014

You have lots of 'merge upstream' commits here, want to rebase?

@ellisonbg
Copy link
Copy Markdown
Member Author

Hmm, why am I getting these in my local master branch. I haven't changed my git workflow but recently started to see these. To get the latest from ipython master I do:

git co master
git remote update
git pull upstream master

That used to not give these merge upstream commits, but now it does. What am I missing?

@minrk
Copy link
Copy Markdown
Member

minrk commented Mar 31, 2014

If you made commits in your master, then pulled from remote master, you would get merges in your own master branch.

@ellisonbg
Copy link
Copy Markdown
Member Author

Hmm, I don't think I ever make commits in my master...unless I did so by mistake. I will check that now...

@ellisonbg
Copy link
Copy Markdown
Member Author

OK, cleaned up commits.

minrk added a commit that referenced this pull request Apr 1, 2014
For 2.0: Fix links in Notebook Help Menu
@minrk minrk merged commit 2e04730 into ipython:master Apr 1, 2014
mattvonrocketstein pushed a commit to mattvonrocketstein/ipython that referenced this pull request Nov 3, 2014
For 2.0: Fix links in Notebook Help Menu
@ellisonbg ellisonbg deleted the helplinks branch March 29, 2015 21:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants