search

Gazler / githug

Git your game on!
MIT License
6.86k stars 1.03k forks source link

delete_branch level #145

Closed smilansky closed 10 years ago

smilansky commented 10 years ago

I made a delete_branch level and put it after branch_at.

Gazler commented 10 years ago

@smilansky thanks for the level. If you could please add a test for your level in between branch_at and merge in https://github.com/Gazler/githug/blob/master/spec/githug_spec.rb so that the build passes then I will merge it in.

smilansky commented 10 years ago

@Gazler just did, thanks for pointing that out!

Gazler commented 10 years ago

@smilansky I am afraid I cannot merge this commit - it appears like you did not rename your .git folder to .githug:

Subproject commit 12975877b11354785bfe3b519f1e515f4d37bf80

This means I cannot easily extract the state that you left the repository in for init_from_level as it has added it to a submodule. This means that currently the level only exists on your computer.

I also have a couple of general comments for creating a pull request, it's not a big deal, but worth knowing:

1) You shouldn't really modify the .gitignore file. Most of the files in there are added by default when creating a gem, it can have some serious consequences if you change it. 2) You should add .DS_Store to your global gitignore. You can get instructions here: http://stackoverflow.com/questions/7335420/global-git-ignore

I hope this doesn't discourage you from fixing these issues, I'll gladly merge it in if you fix the submodule issue.

Thanks, Gazler.

smilansky commented 10 years ago

@Gazler I made the changes, sorry about that, I pushed before I changed it locally. Not sure what happened to my .gitignore as I don't recall changing that - I swapped it back. Thank you for your patience.

Gazler commented 10 years ago

@smilansky The build was still failing because you used single quotes instead of backticks in the spec you wrote. In ruby, single quotes mean string and backticks will execute a shell command.

I have now merged this in but I squashed the commits - https://github.com/Gazler/githug/commit/ef585ae148a153397c7359f19f3870d7205fb99d. Thanks for the level.