merge 'yosemite' branch to master?

[anthrotype]

I noticed that most recent development is happening on a yosemite branch.

DrawBot also seems to require that branch.

Any reasons why this is not merged into master yet?

also, why is it called like that?

Cheers

[typemytype]

no reason, I guess :)

[anthrotype]

let's merge it then!

[justvanrossum]

Yes, please, can the yosemite branch be merged into master?

[justvanrossum]

I see there were commits on both master and yosemite. I'm confused now what is the better branch. Can we please fix this?

[typemytype]

is there a reason why this is not merged yet?

[justvanrossum]

@typesupply, please let us know if we can help in any way. I don't have commit rights, and I also don't have a good view on what happened in the main branch after the Yosemite branch was created. But I think it's important we get this done. Also, there are some pull requests that need merging.

[typesupply]

Sorry. I'm way out of touch with Cocoa development these days. I just added everyone here as collaborators for this project. Let me know if that doesn't give you the access you need.

[justvanrossum]

Thanks, @typesupply!

It seems the Yosemite branch has no conflicts with the master branch. I made a PR: #43
I suggest we just merge it. @typemytype, what do you say?

[justvanrossum]

Alright, it's been merged!

@anthrotype, is it indeed wise to just delete the yosemite branch, like github suggests? Seems clean, but I'm not sure how that will affect others.

[anthrotype]

It's safe in the sense that you don't lose the commits as they are now merged in master, but maybe if someone is downloading vanilla from that branch from some setup script or something, this might break.. I'll just leave it there for a while.

[justvanrossum]

Got it, thanks!