Admin gen

[vicb]

confusion between routing.yml & generator.yml

[weaverryan]

Hey-

What happened with these commits and those from pull requests 16 and 17? It looks like you've got good changes, but github is showing the each pull request brought with it entire chapter changes in unrelated files. Can your changes be isolated and then re-submitted?

Thanks!

[vicb]

This seems to be because some files in the repo use CRLF and I think using LF is better for cross compatibility.
I have no idea on how I can remove a commit from a pull request. May be you can pull my branches and cherry pick the commits ?

[weaverryan]

I'm not sure if there's a way to remove the commit from your branch and re-push it to the pull request. You could try to rebase locally and remove the CF commit and then repush over your branch.

I'm not an owner on this repo, but if the above doesn't work, it'd make life much easier if you cherry-picked locally onto a new branch and opened up a new pull request.

Thanks!

[vicb]

The problem is that the CF commit is done automatically with the settings I use (which are the recommended ones - see http://help.github.com/dealing-with-lineendings/ - if you don't use them then you are running into issues when working across different OSes linux like & windows).

I might be a good idea to give a pointer to this page in the master README of the repo ?

Anyway I have hacked those 3 branches and force push them back to the server, the pull requests should be ok by now.

[weaverryan]

Thanks - the pull requests look clean now.

I honestly don't know about the line-ending issue, but if you think it's an issue, I'd suggest you to open a pull request with one of the files fixed and see what feedback you get.

Thanks again

[vicb]

Ryan,

Anything missing / wrong with my 3 pending PR for them to be merged ?

[weaverryan]

No, they're certainly clean enough to be actioned (i.e. merged or rejected). Let me ping Hugo - the pull requests just might not be getting a ton of attention (I'm not actually an admin on the repo).

[vicb]

Thanks for your help Ryan.

[fabpot]

I've made a fix where I show a valid configuration instead:

2627866