-
Notifications
You must be signed in to change notification settings - Fork 191
Review "Getting Started" Docs #169
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
Conversation
In the Cyton getting started guide:
|
Attack of the dead links.... at the computer now making the changes |
Wifi Getting Started Guide
|
Did you forget to pull from upstream before making changes? I'm seeing some outdated stuff in the diff, and you have some merge conflicts. |
Yes I did forget to pull upstream, how do I fix it? 😞 |
this should work:
Then, it will ask you to clear out the merge conflicts in a text editor. Alternatively you can hit the "Resolve conflicts" button below. If you do that, make sure you run this afterwards:
|
@daniellasry Thanks! |
No description provided.