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

clarify the main purpose of the github installation method #17

Closed
wants to merge 1 commit into from

Conversation

msouff
Copy link
Collaborator

@msouff msouff commented Oct 13, 2021

No description provided.

@msouff msouff requested a review from rileyhales October 13, 2021 15:49
@rileyhales
Copy link
Member

I think this is good. The only other thing you could talk about is why git install is less preferable than conda. Git is more time consuming, less efficient in various ways, more opportunity for bugs, etc. But thats all optional in my opinion. You can merge this.

@rileyhales rileyhales linked an issue Oct 13, 2021 that may be closed by this pull request
@rfun
Copy link
Contributor

rfun commented Oct 14, 2021

@msouff : Could you resolve the conflicts so we can merge this in?

@msouff
Copy link
Collaborator Author

msouff commented Oct 18, 2021

@rfun, I'm not sure why this shows as a conflict. The conflicting file I see is the github_install.rst, which is the file I'm updating. Also, for some reason I am not authorized to merge PRs for this repo.

@rfun
Copy link
Contributor

rfun commented Oct 18, 2021

@msouff : I have increased your level of access to the repo. Let me know if that helps and lets you merge.
Secondly, for the PR, I feel like you don't have the latest Master within the branch you are creating and maybe that's why you are getting this conflict.

Can you try the following commands:

git checkout master
git pull master
git checkout githubinstallcarification
git rebase master
#At this point you should start seeing a merge conflict locally
#complete the rebase and commit your changes after resolving the conflicts
git push -f

@msouff msouff closed this Oct 26, 2021
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.

Update GitHub Install Docs
3 participants