There are three ways to be entered into the contest (if you complete both you'll get three entries). The first way to enter is to download the Koans project, complete it, and post a link to a screenshot of all the tests passing into the comments of this post, make sure you subscribe to the comments so you know when I announce the winner. The second way to enter is to add a new test or tests to the project and submit a pull request via github. The third is to write a blog post about the Koans project and post a link to the post in the comments here.
You can download the project here: https://github.com/bittersweetryan/ColdFusion-Koans. If you'd like a quick intro to the Koans you can view a quick screencast I did here: http://blog.bittersweetryan.com/2011/11/screencast-getting-started-with.html.
I'll be drawing the winner March 1st.
Ryan,
ReplyDeleteI'd love a copy of the ORM book :-)
Sorry I haven't made the final changes you requested on my pull request, but I'm confused how to merge your changes with my changes locally. I'm new to Git. Can you give some insight how to do this?
Thanks!
@Grant, I'm no expert in merging another remote with local either but I can give you a start. First, if you haven't already done so you'll need to add my repository as another remote to your local. To do so open up a command prompt or terminal and go into the main directory of the Koans. Then type in "git remote add upstream git://github.com/bittersweetryan/ColdFusion-Koans.git" which will add a link to the master repository. At this point I'd add and commit or stash the changes you are working on. Now create a new branch to pull the code from my repository into "git checkout -b 'mergeUpstream'". Now you can do a "git pull upstream master" to bring in the changes. This will most likely fail or create some conflicts because I added the ordering around the same time you added new tests. This is where I'd seek the help of a GIT master because I'm not all that great at resolving conflicts in git just yet.
ReplyDelete