boboldehampsink / pushnotifications

DEPRECATED - Push Notifications (iOS/Android) plugin for Craft CMS
MIT License
21 stars 6 forks source link

Master #3

Closed sandy-abrightmind closed 8 years ago

sandy-abrightmind commented 8 years ago
sandy-abrightmind commented 8 years ago

I have completed adding User-Level Permissions for Push Notifications. =)

Thanks! Sandy Davis

boboldehampsink commented 8 years ago

Can you merge into the develop branch instead of master?

sandy-abrightmind commented 8 years ago

How do I merge it into the develop branch instead of the master?

boboldehampsink commented 8 years ago
screen shot 2015-11-09 at 16 08 26
sandy-abrightmind commented 8 years ago

When I click that, what button do I click to merge them?? Because all it says "Able to merge, these branches can be automatically merged."

sandy-abrightmind commented 8 years ago

Do I just create another pull request??

boboldehampsink commented 8 years ago

Ah, I do the merging - you just have to issue a merge (pull) request to develop, instead of master.

sandy-abrightmind commented 8 years ago

Do I do this from my project page? screen shot 2015-11-09 at 9 17 08 am

boboldehampsink commented 8 years ago

Yes

sandy-abrightmind commented 8 years ago

Ok, well I did that... and now it gives me a button to merge the pull request....

boboldehampsink commented 8 years ago

Go here: https://github.com/boboldehampsink/pushnotifications/compare

sandy-abrightmind commented 8 years ago

I can't do anything on that page. It doesn't allow me to create a pull request from there. Maybe I need to create a new pull request that connects my project to your projects "develop" branch??

boboldehampsink commented 8 years ago

I'm clueless

sandy-abrightmind commented 8 years ago

Ok. I did it from my master to your develop branch. Did that work?? I'm clueless too... I've never done any of this in Github.

Sorry....