8000 Concrete Parallel collections article translated by santiagobasulto · Pull Request #88 · scala/docs.scala-lang · GitHub
[go: up one dir, main page]

Skip to content

Conversation

@santiagobasulto
Copy link
Contributor

It's done!

@heathermiller
Copy link
Member

Hi Santiago- I can't merge this-- it's pointing to gh-pages (a few months ago, github stopped generating sites on gh-pages branches, forcing us to branch gh-pages to master) and is attempting to pull in several additional commits from master. I've got to manually merge it instead. For the next translation, could you please switch to pull requests on master?

Thanks a lot, btw, for the shiny new translation!

@santiagobasulto
Copy link
Contributor Author

Hey, sorry for that! I was still working on gh-pages!

Do you want me to move it into master and send you another pull request?

2012/5/21 Heather Miller
reply@reply.github.com:

Hi Santiago- I can't merge this-- it's pointing to gh-pages (a few months ago, github stopped generating sites on gh-pages branches, forcing us to branch gh-pages to master) and is attempting to pull in several additional commits from master. I've got to manually merge it instead. For the next translation, could you please switch to pull requests on master?

Thanks a lot, btw, for the shiny new translation!


Reply to this email directly or view it on GitHub:
#88 (comment)

Santiago Basulto.-

@heathermiller
Copy link
Member

No worries, I just manually merged it and referenced you in the commit, so you've still got credit for it :)
Next time around, just push to master and send your pull to scala/scala.github.com:master

@santiagobasulto
A2BD
Copy link
Contributor Author

Ok, thank you Heather!

2012/5/21 Heather Miller
reply@reply.github.com:

No worries, I just manually merged it and referenced you in the commit, so you've still got credit for it :)
Next time around, just push to master and send your pull to scala/scala.github.com:master


Reply to this email directly or view it on GitHub:
#88 (comment)

Santiago Basulto.-

@heathermiller
Copy link
Member

No worries, thank you!

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.

3 participants

0