Skip to content

Conversation

retiutut
Copy link

No description provided.

@retiutut retiutut changed the title review tutorials for gui v4 Review "Getting Started" Docs Feb 11, 2019
@daniellasry
Copy link

daniellasry commented Feb 12, 2019

In the Cyton getting started guide:

  • The "Forum" link leads to a 404 page. I think it needs an extra slash at the end of the link:

If you are still having troubles connecting to your Cyton board, refer to the Forum for extra troubleshooting advice.

  • Something wrong with the Community Page link:
    image

  • The entire section, "TROUBLE SHOOTING ON MACOS SIERRA" can be deleted, IMO

@daniellasry
Copy link

In the Ganglion getting started guide:

  • This "troubleshooting" link doesn't do anything:
    image

  • The section "RUN THE GUI ON MACOS SIERRA" can be deleted

@retiutut
Copy link
Author

Attack of the dead links.... at the computer now making the changes

@daniellasry
Copy link

daniellasry commented Feb 12, 2019

Wifi Getting Started Guide

@daniellasry
Copy link

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.

@retiutut
Copy link
Author

Yes I did forget to pull upstream, how do I fix it? 😞

@daniellasry
Copy link

this should work:

> git fetch upstream
> git merge upstream/master

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:

> git fetch origin
> git merge origin/master

@retiutut
Copy link
Author

@daniellasry Thanks!

@daniellasry daniellasry merged commit c8ba984 into openbci-archive:master Feb 18, 2019
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.

2 participants