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

PR: Update links to docs when they are ready #7007

Merged
merged 5 commits into from
Jun 15, 2018

Conversation

CAM-Gerlach
Copy link
Member

@CAM-Gerlach CAM-Gerlach commented Apr 23, 2018

@ccordoba12
Copy link
Member

This needs a merge with 3.x now.

@CAM-Gerlach
Copy link
Member Author

CAM-Gerlach commented May 22, 2018

I assume you mean rebase. Yeah, thanks—it was something in #7169 , as I expected might happen. I'll do it as soon as I post the PR for spyder-ide/spyder-docs#13 , which I'm on the absolutely very last style change on and should be up within about 30 mins.

@ccordoba12
Copy link
Member

I assume you mean rebase

I really prefer merges unless there's a strong reason not to do it. In the case of #7141, I asked for a rebase because it's really odd to start a PR in 3.x and then merge it with master.

which I'm on the absolutely very last style change on and should be up within about 30 mins.

Really great to know!

@CAM-Gerlach
Copy link
Member Author

CAM-Gerlach commented May 22, 2018

Oh, okay...I guess I assumed that because before I always recall you asking for a rebase when a PR needed to be updated for one reason or another, and I figured you wouldn't want to pollute the mainline's history with a pointless merge. I generally regarded anything merged to the main repo as inviolate, but PR branches as malleable to conform properly to the latest mainline.

@ccordoba12
Copy link
Member

It's easier to handle merges for developers and newcomers alike. Besides, rebases usually tamper with history.

I usually ask for rebases when the rebase is very simple to do (e.g. to pick up a change in our CIs done the same day or so).

@ccordoba12 ccordoba12 changed the title [Blocked] PR: Update links to docs when they are ready PR: Update links to docs when they are ready Jun 15, 2018
@ccordoba12
Copy link
Member

@CAM-Gerlach, I'm going to merge this even if the footer is not ready. I hope @dalthviz can finish it next week.

@ccordoba12 ccordoba12 merged commit 67699e4 into spyder-ide:3.x Jun 15, 2018
ccordoba12 added a commit that referenced this pull request Jun 15, 2018
@CAM-Gerlach CAM-Gerlach deleted the update-doc-link branch July 8, 2018 16:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants