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

Fixes usage links in USING_ADVANCED.md #1139

Closed
wants to merge 1 commit into from
Closed

Fixes usage links in USING_ADVANCED.md #1139

wants to merge 1 commit into from

Conversation

wraith13
Copy link
Contributor

Just fixes link path in document.

Copy link
Member

@UziTech UziTech left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@styfle this should probably be merged before #1138

@styfle
Copy link
Member

styfle commented Mar 13, 2018

@UziTech I think it might be easier to merge my branch first and then @wraith13 can open a new PR against the new master. Are you both okay with this?

@wraith13
Copy link
Contributor Author

What does "new master" mean?
I can see only one branch named master.

Because my English is not good, I may misunderstand something.
You can do it on your own.

@styfle
Copy link
Member

styfle commented Mar 21, 2018

@wraith13 Sorry, I didn't communicate that well.

We just merged #1138 which moved this file from USING_ADVANCED.md to /docs/USING_ADVANCED.md. You can see this change in the master branch now which is why GitHub shows the message This branch has conflicts that must be resolved.

So you can either rebase this branch on master, or create a new branch from the latest master.

Thanks! 👍

@wraith13
Copy link
Contributor Author

I see. I will do it.

@wraith13
Copy link
Contributor Author

#1151
I did it.

@wraith13 wraith13 closed this Mar 21, 2018
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.

None yet

3 participants