Skip to content
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

Rudimentary support for string ranges #54

Closed
wants to merge 4 commits into from
Closed

Conversation

prakashk
Copy link
Member

Ranges should support string ranges too. Just basic stuff. Doesn't handle mixed type ranges like 1 .. "5".

Still learning Scala, it is probably completely non-idiomatic, so feel free to improve it.

@stevan
Copy link
Member

stevan commented Feb 13, 2013

Prakash this is not merging in cleaning to master, can you please rework the commit so that it will merge in cleanly? Thanks, Stevan

@prakashk
Copy link
Member Author

I am not sure what you mean by "rework". Could you elaborate on what the problem was?

Actually, I'd like you to hold off on this one. I am looking at the documentation for the range operator (perlop), and I will need to make more changes even to call it "rudimentary" support. I will update the request when I am done.

@stevan
Copy link
Member

stevan commented Feb 14, 2013

Prakash,

If you look at this pull request, it says "cannot be automatically merged" this is likely because there are conflicts in the merge. You should be able to resolve these conflicts by merging master back into your branch, resolve any conflicts, then re-issue the pull request, at which point it should just work.

If you want to wait on this though, that is fine.

  • Stevan

@jasonmay
Copy link
Member

Hi Prakash,

runtime-improvements is a branch that is out-of-date, which is causing the un-clean merge. Could you re-play these on to a new branch (made off master)?

Thanks!
Jason

@prakashk
Copy link
Member Author

Hi Jason,

I just finished merging master into my local copy of runtime-improvements, and resolved conflicts. Should I go ahead with committing and pushing these changes (about 50 files!)? Or, is it preferred to make my changes to a new branch of 'master'?

Thanks,
Prakash

@prakashk
Copy link
Member Author

I created a new branch prakashk/string-ranges off of master, and applied my changes to that branch. Should I create a new pull request? Or, is there a way this one can be reused?

@stevan
Copy link
Member

stevan commented Feb 15, 2013

Prakash,

Please make a new pull request, this one won't transfer.

Thanks again for the work!

  • Stevean

@prakashk
Copy link
Member Author

Replaced by #56

@prakashk prakashk closed this Feb 15, 2013
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.

None yet

3 participants