Skip to content
This repository has been archived by the owner on Aug 1, 2021. It is now read-only.

two-bucket submission! #68

Merged
merged 1 commit into from
Dec 20, 2014
Merged

two-bucket submission! #68

merged 1 commit into from
Dec 20, 2014

Conversation

lindslev
Copy link

I've loved solving exercisms so I decided to write a brainteasing one myself!

@kytrinyx
Copy link
Member

Very cool!

Would you look through the contributing guide so we get all the pieces in place? https://github.com/exercism/x-api/blob/master/CONTRIBUTING.md#new-problems

@lindslev
Copy link
Author

Glad you think it's cool! Sorry I hadn't seen the contributing guide before you linked it - I took a look, added the slug to config.json and ran configlet in my local /xjavascript directory. I assumed that meant the CI build would pass, but perhaps I'm missing something?

@kytrinyx
Copy link
Member

Configlet is complaining about the following:

-> missing example solution in [two-bucket].

Also, make test is failing, since it can't find example.js in order to test the test suite.

There are a couple more things that have to be done:

  • The README.md needs to go into the x-common repository (please see the contributing guide for the particulars of how it needs to go in there), and
  • The example solution must be called example.js. All files that are not called something with example will be delivered to the user when they say exercism fetch.

@lindslev
Copy link
Author

This is still failing the build because I'm used to testing with testem and
thus don't use module.exports at the end of my files. Just a sec.

@lindslev
Copy link
Author

Yay, a check mark. Super sorry for missing some of the key elements in contributing, and thanks for the help. Hopefully the bases are covered now but let me know if not.

@kytrinyx
Copy link
Member

❤️ green build!

This is looking great. The last bit of cleanup is to delete the README.md, since that will be provided by the API via the x-common metadata stuff.

Would you also mind squashing the commits once you've made the final change? (If that's intimidating let me know and I'll walk you through it)

http://blog.steveklabnik.com/posts/2012-11-08-how-to-squash-commits-in-a-github-pull-request

added slug to config.json

renamed solutions to examples

module.exports

removed README.md

two-bucket submission
@lindslev
Copy link
Author

Sweet! So I think I squashed at least somewhat correctly (see: lindslev@3301d63) and now suspect I need to make a pull request from that new branch (thought I had to make a new branch to rebase), but thought I'd check with you before doing that. Let me know if that's what I need to do!

@kytrinyx
Copy link
Member

That looks excellent. You don't need to make a new PR, you can update this one by using git push --force:

git push --force origin two-bucket:master

That will make your github master be exactly what is on the local two-bucket branch.

Afterwards, (when this is merged) you'll probably want to reset your master to whatever is on the upstream master:

To check if you have the remote set:

git remote -v

It will have two lines with

upstream    https://github.com/exercism/xjavascript.git (fetch)
upstream https://github.com/exercism/xjavascript.git (push)

It could be named anything, but upstream is a conventional choice.

Then, to reset everything do this:

git checkout master
git fetch upstream
git reset --hard upstream/master
git push --force origin master

@lindslev
Copy link
Author

Alright, I followed those instructions, and I believe we're good! Thanks a ton for the mini git lesson :).

@kytrinyx
Copy link
Member

Perfect! Thanks for your patience ❤️

kytrinyx added a commit that referenced this pull request Dec 20, 2014
@kytrinyx kytrinyx merged commit 16691ee into exercism:master Dec 20, 2014
@lindslev
Copy link
Author

And thank you! 👍 :)

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants