Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

update composer's branch-alias #7391

Merged

Conversation

samsonasik
Copy link
Contributor

dev-master : 2.4-dev
dev-develop : 2.5-dev

/cc @Ocramius @weierophinney

dev-master  : 2.4-dev
dev-develop : 2.5-dev
@samsonasik
Copy link
Contributor Author

@weierophinney I think it can be merged now?

@harikt
Copy link
Contributor

harikt commented Apr 1, 2015

You don't need branch alias if the branches are named 2.0, 3.0 etc.

https://groups.google.com/d/msg/composer-dev/zZBmTteaQZI/YZFGKPELwnAJ

Wonder how the branches will be. Is it still develop and master ?

weierophinney added a commit that referenced this pull request May 4, 2015
weierophinney added a commit that referenced this pull request May 4, 2015
@weierophinney weierophinney merged commit cabf3db into zendframework:master May 4, 2015
weierophinney added a commit that referenced this pull request May 4, 2015
@weierophinney weierophinney added this to the 2.4.1 milestone May 4, 2015
@weierophinney
Copy link
Member

@harikt The releasable branch will continue to be master, and develop will be the next minor/major release. This simplifies development for contributors ("Which branch should I fork?" has exactly two possible answers).

Thanks, @samsonasik - thought I'd done this with the 2.4 release, but clearly missed it!

@samsonasik samsonasik deleted the hotfix/composer-branch-alias branch May 4, 2015 17:41
weierophinney added a commit to zendframework/zend-authentication that referenced this pull request May 14, 2015
…otfix/composer-branch-alias

update composer's branch-alias
weierophinney added a commit to zendframework/zend-authentication that referenced this pull request May 14, 2015
weierophinney added a commit to zendframework/zend-mail that referenced this pull request May 14, 2015
…otfix/composer-branch-alias

update composer's branch-alias
weierophinney added a commit to zendframework/zend-mail that referenced this pull request May 14, 2015
weierophinney added a commit to zendframework/zend-barcode that referenced this pull request May 14, 2015
…otfix/composer-branch-alias

update composer's branch-alias
weierophinney added a commit to zendframework/zend-barcode that referenced this pull request May 14, 2015
weierophinney added a commit to zendframework/zend-captcha that referenced this pull request May 15, 2015
…otfix/composer-branch-alias

update composer's branch-alias
weierophinney added a commit to zendframework/zend-captcha that referenced this pull request May 15, 2015
weierophinney added a commit to zendframework/zend-uri that referenced this pull request May 15, 2015
…otfix/composer-branch-alias

update composer's branch-alias
weierophinney added a commit to zendframework/zend-uri that referenced this pull request May 15, 2015
weierophinney added a commit to zendframework/zend-eventmanager that referenced this pull request May 15, 2015
…otfix/composer-branch-alias

update composer's branch-alias
weierophinney added a commit to zendframework/zend-eventmanager that referenced this pull request May 15, 2015
weierophinney added a commit to zendframework/zend-servicemanager that referenced this pull request May 15, 2015
…otfix/composer-branch-alias

update composer's branch-alias
weierophinney added a commit to zendframework/zend-servicemanager that referenced this pull request May 15, 2015
weierophinney added a commit to zendframework/zend-tag that referenced this pull request May 15, 2015
…otfix/composer-branch-alias

update composer's branch-alias
weierophinney added a commit to zendframework/zend-tag that referenced this pull request May 15, 2015
weierophinney added a commit to zendframework/zend-debug that referenced this pull request May 15, 2015
…otfix/composer-branch-alias

update composer's branch-alias
weierophinney added a commit to zendframework/zend-debug that referenced this pull request May 15, 2015
weierophinney added a commit to zendframework/zend-math that referenced this pull request May 15, 2015
…otfix/composer-branch-alias

update composer's branch-alias
weierophinney added a commit to zendframework/zend-json that referenced this pull request May 15, 2015
…otfix/composer-branch-alias

update composer's branch-alias
weierophinney added a commit to zendframework/zend-json that referenced this pull request May 15, 2015
weierophinney added a commit to zendframework/zend-validator that referenced this pull request May 15, 2015
…otfix/composer-branch-alias

update composer's branch-alias
weierophinney added a commit to zendframework/zend-validator that referenced this pull request May 15, 2015
weierophinney added a commit to zendframework/zend-file that referenced this pull request May 15, 2015
…otfix/composer-branch-alias

update composer's branch-alias
weierophinney added a commit to zendframework/zend-file that referenced this pull request May 15, 2015
weierophinney added a commit to zendframework/zend-escaper that referenced this pull request May 15, 2015
…otfix/composer-branch-alias

update composer's branch-alias
weierophinney added a commit to zendframework/zend-escaper that referenced this pull request May 15, 2015
weierophinney added a commit to zendframework/zend-dom that referenced this pull request May 15, 2015
…otfix/composer-branch-alias

update composer's branch-alias
weierophinney added a commit to zendframework/zend-dom that referenced this pull request May 15, 2015
weierophinney added a commit to zendframework/zend-session that referenced this pull request May 15, 2015
…otfix/composer-branch-alias

update composer's branch-alias
weierophinney added a commit to zendframework/zend-session that referenced this pull request May 15, 2015
weierophinney added a commit to zendframework/zend-log that referenced this pull request May 15, 2015
…otfix/composer-branch-alias

update composer's branch-alias
weierophinney added a commit to zendframework/zend-log that referenced this pull request May 15, 2015
weierophinney added a commit to zendframework/zend-cache that referenced this pull request May 15, 2015
…otfix/composer-branch-alias

update composer's branch-alias
weierophinney added a commit to zendframework/zend-cache that referenced this pull request May 15, 2015
weierophinney added a commit to zendframework/zend-soap that referenced this pull request May 15, 2015
…otfix/composer-branch-alias

update composer's branch-alias
weierophinney added a commit to zendframework/zend-soap that referenced this pull request May 15, 2015
weierophinney added a commit to zendframework/zend-mime that referenced this pull request May 15, 2015
…otfix/composer-branch-alias

update composer's branch-alias
weierophinney added a commit to zendframework/zend-mime that referenced this pull request May 15, 2015
weierophinney added a commit to zendframework/zend-view that referenced this pull request May 15, 2015
…otfix/composer-branch-alias

update composer's branch-alias
weierophinney added a commit to zendframework/zend-view that referenced this pull request May 15, 2015
weierophinney added a commit to zendframework/zend-navigation that referenced this pull request May 15, 2015
…otfix/composer-branch-alias

update composer's branch-alias
weierophinney added a commit to zendframework/zend-navigation that referenced this pull request May 15, 2015
weierophinney added a commit to zendframework/zend-feed that referenced this pull request May 15, 2015
…otfix/composer-branch-alias

update composer's branch-alias
weierophinney added a commit to zendframework/zend-feed that referenced this pull request May 15, 2015
weierophinney added a commit to zendframework/zend-permissions-acl that referenced this pull request May 15, 2015
…otfix/composer-branch-alias

update composer's branch-alias
weierophinney added a commit to zendframework/zend-permissions-acl that referenced this pull request May 15, 2015
weierophinney added a commit to zendframework/zend-permissions-rbac that referenced this pull request May 15, 2015
…otfix/composer-branch-alias

update composer's branch-alias
weierophinney added a commit to zendframework/zend-permissions-rbac that referenced this pull request May 15, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants