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

Slightly elaborated the instruction for manual install #1114

Merged
merged 1 commit into from
Jun 20, 2016

Conversation

brajpanda
Copy link
Contributor

No description provided.

@ljharb ljharb added informational needs rebase Please rebase your branch onto latest master! This removes merge commits, & keeps the git log clean. labels Jun 14, 2016
@brajpanda
Copy link
Contributor Author

Hi,

I am a newbie and I see 2 labels to my PR - 'Informational' and 'needs rebase'. Please let me know if I am supposed to do anything about it or if it is just waiting for reviewer to merge.

TIA,
Braj

@ljharb
Copy link
Member

ljharb commented Jun 18, 2016

@brajpanda hi! sorry, I should have commented. This commit is based on 2 commits behind the latest master. If you could check it out locally, rebase it on top of the latest master, and force push, then I can merge it ASAP! I do see you created this on the web interface, so if that's a problem I can merge as-is.

@brajpanda
Copy link
Contributor Author

@ljharb Thanks for helping out. I have done a rebase and a force push. Do I have to create another PR?

@ljharb
Copy link
Member

ljharb commented Jun 20, 2016

@brajpanda no, please don't create another PR :-) before you do the rebase, make sure to git fetch, and then rebase onto origin/master, not your local master.

@brajpanda
Copy link
Contributor Author

@ljharb Thanks, have done exactly that.

@ljharb
Copy link
Member

ljharb commented Jun 20, 2016

I'm still not seeing it - can you make sure it's rebased on top of 36b1ea9 ?

@brajpanda
Copy link
Contributor Author

I did the following:
git remote add upstream https://github.com/creationix/nvm.git
git fetch upstream
git checkout master
git rebase upstream/master
git push -f origin master

Not sure what I am missing.

@brajpanda
Copy link
Contributor Author

@ljharb I think I know what is missing. I am fixing it.

@brajpanda
Copy link
Contributor Author

@ljharb I tried what is mentioned here:
https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request
Can you see my commit now?

@ljharb
Copy link
Member

ljharb commented Jun 20, 2016

Hmm, I can't. No worries though, I'll just merge it :-)

@ljharb ljharb merged commit d000624 into nvm-sh:master Jun 20, 2016
@ljharb ljharb modified the milestone: v0.31.2 Jun 25, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
informational needs rebase Please rebase your branch onto latest master! This removes merge commits, & keeps the git log clean.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants