Skip to content

Update ACKNOWLEDGEMENTS.md #39

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

Merged
merged 1 commit into from
Jul 26, 2019
Merged

Update ACKNOWLEDGEMENTS.md #39

merged 1 commit into from
Jul 26, 2019

Conversation

ComputerAided
Copy link
Contributor

Added preliminary home page and software interrupts page to wiki, as a result of issue #34 in sparkfun/Ardunio_Apollo3. Add name to contributors list.

Add name to contributors list.
@ComputerAided
Copy link
Contributor Author

I'm not sure if the wiki pages will transfer over by forking the repository, so let me know if there is a better way to do this.

@oclyke
Copy link
Contributor

oclyke commented Jul 26, 2019

@ComputerAided I see the trouble here - your wiki changes are not coming through. Check out this article (which I will be following).

https://www.growingwiththeweb.com/2016/07/enabling-pull-requests-on-github-wikis.html

I will accept this PR (to get your name on Acknowledgements) and then give you the link to the new Wiki repo for you to repeat this PR. Thanks!

@oclyke oclyke merged commit 8f14b97 into sparkfun:master Jul 26, 2019
@oclyke oclyke changed the title Add first wiki pages and update ACKNOWLEDGEMENTS.md Update ACKNOWLEDGEMENTS.md Jul 26, 2019
@oclyke
Copy link
Contributor

oclyke commented Jul 30, 2019

@ComputerAided I've made it possible for users to edit the wiki by editing this repo: https://github.com/sparkfun/Arduino_Apollo3-wiki

Can you repeat your PR here with the Wiki changes? Thanks!

@ComputerAided
Copy link
Contributor Author

@oclyke, it is at sparkfun/Arduino_Apollo3-wiki#1

@oclyke
Copy link
Contributor

oclyke commented Jul 30, 2019

Ahh! Sorry @ComputerAided I've royally messed up. Please keep a copy of your changes locally for a moment while I sort it out...

@ComputerAided
Copy link
Contributor Author

It's okay @oclyke, just let me know when to create a new pull request.

@oclyke
Copy link
Contributor

oclyke commented Jul 30, 2019

Alright here you go! (had to make a new repo because I unthinkingly made changes to the private wiki and had no good way to resolve the merge conflicts, so the Travis CI sync method got messed up)

https://github.com/sparkfun/Arduino_Apollo3_wiki

Thanks for the patience!

@ComputerAided

@ComputerAided
Copy link
Contributor Author

@oclyke I made a new PR, but I think I am getting a merge conflict again. I'll keep the files locally if you need to sort anything out.

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