search

CocoaPods / blog.cocoapods.org

The blog for CocoaPods
https://blog.cocoapods.org/
34 stars 38 forks source link

added realtime api talk by myself to cocoa kucha berlin #35

Closed JensRavens closed 10 years ago

orta commented 10 years ago

Hi, great!

If you rebase I'll merge, this looks like a big topic for 6 minutes, hope you're a fast speaker :P

JensRavens commented 10 years ago

If you tell me how to do that I'm happy to help. GitHub ist still quite new for me ;-)

orta commented 10 years ago

No worries, I've done it for you.

What it involves is pulling in changes to the main repo, fixing the merge conflicts ( you and @neonichu had edited the same line ) and then pushing the changes.

Instead I added your repo as a remote repo, pulled your change, fixed the conflict, then pushed ut back up. Took less then 10 seconds.

And it's now deployed too :+1:

JensRavens commented 10 years ago

Great! I will do this next time :-)