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

Fix broken links #60

Merged
merged 17 commits into from
Jun 7, 2018
Merged

Fix broken links #60

merged 17 commits into from
Jun 7, 2018

Conversation

jaxxzer
Copy link
Member

@jaxxzer jaxxzer commented May 31, 2018

Fix #58

@jaxxzer
Copy link
Member Author

jaxxzer commented May 31, 2018

The first commit here addresses the first failure shown here: https://travis-ci.org/bluerobotics/bluerobotics.github.io/builds/386272848#L676

@jaxxzer
Copy link
Member Author

jaxxzer commented Jun 6, 2018

@mariya-bluerobotics I would have preferred the link fixes go in separate commits. As a general rule, I like for a commit to contain changes inside only a single directory. This is not something to hold this PR up, though.

Please rebase and resolve the conflicts 🙃

It is a little bit weird that there is a merge commit here. If you are not sure of what you are doing with git, please ask.

@jaxxzer jaxxzer changed the title bar02: fix broken link Fix broken links Jun 6, 2018
@jaxxzer jaxxzer mentioned this pull request Jun 6, 2018
@mariyachanniwala
Copy link
Contributor

Hey Jacob,

You want me to do every error in a different commit? I am not sure if I understand. Do you want me to do errors in one file in a single commit or like each individual error in different commits?

@jaxxzer
Copy link
Member Author

jaxxzer commented Jun 7, 2018

@mariyachanniwala it looks like our rebase uncovered some more CI failures. Please have a look, let me know if they look like things you have already addressed.

@mariyachanniwala
Copy link
Contributor

Yeah these are all new issues. Looks like I need to change a few more things. I dont know how that happened though.

@jaxxzer
Copy link
Member Author

jaxxzer commented Jun 7, 2018

magic

@jaxxzer jaxxzer merged commit 20f888a into master Jun 7, 2018
@jaxxzer jaxxzer deleted the ci-fix branch June 7, 2018 21:54
@jaxxzer
Copy link
Member Author

jaxxzer commented Jun 7, 2018

Thanks!

@mariyachanniwala
Copy link
Contributor

no problem!

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